diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index e44f7c87bdd..da56e0ce438 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -102,35 +102,34 @@ jobs:
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
-          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app/Contents/runtime/Contents/MacOS/libjli.dylib
-          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app/Contents/MacOS/JabRef
-          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: Tobias Diez (W2PU6LW5U5)" build/distribution/JabRef.app
+          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app/Contents/runtime/Contents/MacOS/libjli.dylib
+          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app/Contents/MacOS/JabRef
+          codesign --entitlements buildres/mac/jabref.entitlements --options runtime -vvv -f --sign "Developer ID Application: JabRef e.V. (6792V39SK3)" build/distribution/JabRef.app
           jpackage --type pkg --dest build/distribution --name JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type dmg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
-          codesign -s "Developer ID Application: Tobias Diez (W2PU6LW5U5)" --options runtime --entitlements buildres/mac/jabref.entitlements -vvvv --deep "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
+          codesign -s "Developer ID Application: JabRef e.V. (6792V39SK3)" --options runtime --entitlements buildres/mac/jabref.entitlements -vvvv --deep "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
           jpackage --type pkg --dest build/distribution --name JabRef --mac-package-identifier JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --app-image build/distribution/JabRef.app --verbose --type pkg --vendor JabRef --app-version "${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}" --file-associations buildres/mac/bibtexAssociations.properties --resource-dir buildres/mac
-          productsign --sign "Developer ID Installer: Tobias Diez (W2PU6LW5U5)" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
+          productsign --sign "Developer ID Installer: JabRef e.V. (6792V39SK3)" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
+      - name: Notarize dmg and pkg installer
+        if: matrix.os == 'macos-latest' && github.ref == 'refs/heads/main'
+        shell: bash
+        run: |
+          REQUEST_UUID_DMG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "6792V39SK3" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg" | grep RequestUUID | awk '{print $3}')
+          while xcrun altool --notarization-info "$REQUEST_UUID_DMG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
+            echo "Verification in progress..."
+            sleep 30
+          done
+          xcrun stapler staple "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
+          spctl -vvv --assess --type exec build/distribution/JabRef.app
+          codesign -vvv --deep --strict "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
+          codesign -dvv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
+          REQUEST_UUID_PKG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "6792V39SK3" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" | grep RequestUUID | awk '{print $3}')
+          while xcrun altool --notarization-info "$REQUEST_UUID_PKG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
+            echo "Verification in progress..."
+            sleep 30
+          done
+          xcrun stapler staple "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
+          rm "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg"
           mv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg"
-      # DISABLED UNTIL WE HAVE A NEW APPLE DEVELOPER ACCOUNT
-      # - name: Notarize dmg and pkg installer
-      #   if: matrix.os == 'macos-latest' && github.ref == 'refs/heads/main'
-      #   shell: bash
-      #   run: |
-      #     REQUEST_UUID_DMG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "W2PU6LW5U5" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg" | grep RequestUUID | awk '{print $3}')
-      #     while xcrun altool --notarization-info "$REQUEST_UUID_DMG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
-      #       echo "Verification in progress..."
-      #       sleep 30
-      #     done
-      #     xcrun stapler staple "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-      #     spctl -vvv --assess --type exec build/distribution/JabRef.app
-      #     codesign -vvv --deep --strict "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-      #     codesign -dvv "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.dmg"
-      #     REQUEST_UUID_PKG=$(xcrun altool --verbose --notarize-app --primary-bundle-id "org.jabref" --username ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} --password ${{ secrets.OSX_NOTARIZATION_APP_PWD }} --asc-provider "W2PU6LW5U5" --file "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg" | grep RequestUUID | awk '{print $3}')
-      #     while xcrun altool --notarization-info "$REQUEST_UUID_PKG" -u ${{ secrets.OSX_NOTARIZATION_APP_USERNAME }} -p  ${{ secrets.OSX_NOTARIZATION_APP_PWD }} | grep "Status: in progress" > /dev/null; do
-      #       echo "Verification in progress..."
-      #       sleep 30
-      #     done
-      #     xcrun stapler staple "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-signed.pkg"
-      #     rm "build/distribution/JabRef-${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}.pkg"
       - name: Package application image
         shell: bash
         run: ${{ matrix.archivePortable }}
diff --git a/buildres/csl/csl-styles/ageing-and-society.csl b/buildres/csl/csl-styles/ageing-and-society.csl
index 53d2b243028..6a427a0ad6b 100644
--- a/buildres/csl/csl-styles/ageing-and-society.csl
+++ b/buildres/csl/csl-styles/ageing-and-society.csl
@@ -14,7 +14,7 @@
     <category field="biology"/>
     <issn>0144-686X</issn>
     <eissn>1469-1779</eissn>
-    <updated>2017-06-04T17:19:24+00:00</updated>
+    <updated>2021-04-10T17:19:24+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -107,7 +107,7 @@
   <macro name="pages">
     <text variable="page"/>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true">
     <sort>
       <key variable="author"/>
       <key macro="year-date"/>
diff --git a/buildres/csl/csl-styles/catholic-biblical-association.csl b/buildres/csl/csl-styles/catholic-biblical-association.csl
index fa76ed59a87..7b178cf78cf 100644
--- a/buildres/csl/csl-styles/catholic-biblical-association.csl
+++ b/buildres/csl/csl-styles/catholic-biblical-association.csl
@@ -1,24 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago" default-locale="en-US">
   <info>
     <title>Catholic Biblical Association (full note)</title>
     <id>http://www.zotero.org/styles/catholic-biblical-association</id>
     <link href="http://www.zotero.org/styles/catholic-biblical-association" rel="self"/>
     <link href="http://www.zotero.org/styles/society-of-biblical-literature-fullnote-bibliography" rel="template"/>
-    <link href="http://cba.cua.edu/instruct2%5Ccbqinstr%5Cinstrcbq.pdf" rel="documentation"/>
+    <link href="https://assets.noviams.com/novi-file-uploads/cba/PDFs/CBQ-Instructions-for-Contributors-2020.pdf" rel="documentation"/>
+    <link href="https://www.catholicbiblical.org/cbq-instructions-for-contributors" rel="documentation"/>
     <author>
       <name>Nathan LaMontagne</name>
       <email>nathan.lamontagne@gmail.com</email>
     </author>
+    <contributor>
+      <name>J. David Stark</name>
+      <email>david@jdavidstark.com</email>
+      <uri>https://www.jdavidstark.com</uri>
+    </contributor>
     <category citation-format="note"/>
     <category field="theology"/>
-    <updated>2019-11-05T09:18:20+00:00</updated>
+    <updated>2021-03-31T17:57:09+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale>
     <terms>
       <term name="editor" form="verb-short">ed.</term>
       <term name="translator" form="verb-short">trans.</term>
+      <!-- Overrides the defaulte en dash delimiter with the hyphen delimiter required by CBA sec. 23. -->
+      <term name="page-range-delimiter">-</term>
+      <!-- Allow for section-based citations per CBA's fallback to CMS. -->
+      <term name="section" form="short">
+        <single>§</single>
+        <multiple>§§</multiple>
+      </term>
     </terms>
   </locale>
   <!--
@@ -152,11 +165,12 @@
           </else-if>
         </choose>
       </if>
+      <!-- Enforces use of title case per CBA sec. 24. -->
       <else-if type="book">
-        <text variable="title" form="short" font-style="italic"/>
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else-if>
       <else>
-        <text variable="title" form="short" quotes="true"/>
+        <text variable="title" form="short" quotes="true" text-case="title"/>
       </else>
     </choose>
   </macro>
@@ -178,11 +192,12 @@
           </if>
         </choose>
       </if>
+      <!-- Enforces use of title case per CBA sec. 24. -->
       <else-if type="book">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" text-case="title"/>
       </else-if>
       <else>
-        <text variable="title" quotes="true"/>
+        <text variable="title" quotes="true" text-case="title"/>
       </else>
     </choose>
   </macro>
@@ -208,9 +223,10 @@
     </names>
   </macro>
   <macro name="editor">
+    <!-- Outputs citation of a work with only editors per CMS with "[name], ed." or "[names], eds." -->
     <names variable="editor">
-      <label form="verb-short" prefix=", " suffix="."/>
       <name and="text" sort-separator=", " delimiter=", "/>
+      <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
   <macro name="volumes">
@@ -246,7 +262,15 @@
     </group>
   </macro>
   <macro name="collection">
-    <text variable="collection-title"/>
+    <!-- CBQ uses a series abbreviation scheme that resembles but is not identical to that of the SBL Handbook of Style. See CBQ's guidelines, sec. 43, https://assets.noviams.com/novi-file-uploads/cba/PDFs/CBQ-Instructions-for-Contributors-2020.pdf. The macro below allows for a collection-title-short form to be stored and used if it is available. If it does not exist, the style uses the full series name. -->
+    <choose>
+      <if variable="collection-title">
+        <text variable="collection-title" form="short"/>
+      </if>
+      <else>
+        <text variable="collection-title"/>
+      </else>
+    </choose>
     <text variable="collection-number" prefix=" "/>
   </macro>
   <macro name="edition">
@@ -260,7 +284,8 @@
             </group>
           </if>
           <else>
-            <text variable="edition" text-case="capitalize-first" suffix="."/>
+            <!-- Removes an initial capital on text-based editions like rev. ed. -->
+            <text variable="edition" suffix="."/>
           </else>
         </choose>
       </if>
@@ -346,18 +371,29 @@
       <if variable="locator" match="none">
         <text macro="pages" prefix=" "/>
       </if>
-      <else-if type="article-journal chapter" match="any">
-        <text macro="pages"/>
+      <!-- Adds support for section-based citations. -->
+      <else-if locator="section">
+        <text term="section" form="short" prefix=" "/>
+        <text variable="locator"/>
+      </else-if>
+      <else-if type="article-journal chapter" locator="page">
+        <text macro="pages" prefix=" "/>
         <text variable="locator" prefix=", here "/>
       </else-if>
-      <else-if type="entry-dictionary entry-encyclopedia" match="any">
+      <else-if type="entry-dictionary entry-encyclopedia" locator="page">
         <text macro="pages"/>
         <text variable="locator" prefix=", esp. "/>
       </else-if>
+      <!-- Corrects improper spacing and delimitation with volume-page citations. See CBA sec. 24. -->
+      <else-if variable="volume">
+        <number variable="volume" form="numeric" prefix=" " suffix=":"/>
+        <text variable="locator"/>
+      </else-if>
       <else>
+        <!-- Adds sub verbo to an initial citation where it had previously been left out. -->
         <choose>
-          <if variable="volume">
-            <number variable="volume" form="numeric" prefix=" " suffix="."/>
+          <if locator="sub-verbo" match="any">
+            <text term="sub verbo" form="short" prefix=" "/>
           </if>
         </choose>
         <text variable="locator" prefix=" "/>
@@ -369,13 +405,14 @@
       <if type="article-journal">
         <text variable="page" prefix=" "/>
       </if>
+      <!-- Corrects the dictionary entry total page range output when a volume is cited. -->
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <choose>
           <if variable="volume">
-            <number variable="volume" form="numeric" suffix="."/>
+            <number variable="volume" form="numeric" suffix=":"/>
           </if>
         </choose>
-        <text variable="page" prefix=" "/>
+        <text variable="page"/>
       </else-if>
     </choose>
   </macro>
@@ -404,59 +441,91 @@
       </date>
     </group>
   </macro>
+  <macro name="custom">
+    <!-- Add support for custom citations specified via annote. -->
+    <group>
+      <text variable="annote"/>
+      <choose>
+        <if locator="sub-verbo" match="any">
+          <text term="sub verbo" form="short" prefix=" "/>
+          <text variable="locator" prefix=" "/>
+        </if>
+        <else>
+          <text variable="locator" prefix=" "/>
+        </else>
+      </choose>
+    </group>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
-    <layout delimiter="; ">
+    <!-- Adds a period at the end of a citation per current CBA guidelines (deference to CMS, examples in sec. 24). -->
+    <layout delimiter="; " suffix=".">
       <choose>
+        <!-- Eliminates the spurious uppercasing of ibid. if it appears mid-note. -->
         <if position="ibid-with-locator">
           <group delimiter=", ">
-            <text term="ibid" text-case="capitalize-first" suffix="."/>
+            <text term="ibid"/>
             <text macro="point-locators-subsequent"/>
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" text-case="capitalize-first" suffix="."/>
+          <text term="ibid"/>
         </else-if>
         <else-if position="subsequent">
-          <group delimiter=", ">
-            <text macro="contributors-short"/>
-            <text macro="title-short"/>
-            <text macro="point-locators-subsequent"/>
-          </group>
-        </else-if>
-        <else>
           <choose>
-            <if type="book chapter article-journal thesis paper-conference speech" match="any">
-              <group delimiter=", " suffix=" ">
-                <text macro="contributors"/>
-                <text macro="title"/>
-                <text macro="container-title"/>
-              </group>
-              <group delimiter="; " prefix="(" suffix=")">
-                <text macro="translator"/>
-                <text macro="volumes"/>
-                <text macro="secondary-contributors"/>
-                <text macro="collection"/>
-                <text macro="edition"/>
-                <text macro="issue-note"/>
-              </group>
-              <text macro="point-locators"/>
+            <!-- Add support for custom citations specified via annote. -->
+            <if variable="annote">
+              <text macro="custom"/>
             </if>
-            <else-if type="entry-encyclopedia entry-dictionary" match="any">
-              <group delimiter=", ">
-                <text macro="contributors"/>
-                <text macro="title"/>
-                <text macro="container-title"/>
-                <text macro="point-locators"/>
-              </group>
-            </else-if>
-            <else-if type="webpage post" match="any">
+            <else>
               <group delimiter=", ">
-                <text macro="contributors"/>
-                <text macro="title"/>
-                <text macro="webpage-title"/>
-                <text macro="webpage-information"/>
+                <text macro="contributors-short"/>
+                <text macro="title-short"/>
+                <text macro="point-locators-subsequent"/>
               </group>
-            </else-if>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <choose>
+            <if variable="annote">
+              <text macro="custom"/>
+            </if>
+            <else>
+              <choose>
+                <if type="book chapter article-journal thesis paper-conference speech" match="any">
+                  <group delimiter=", " suffix=" ">
+                    <text macro="contributors"/>
+                    <text macro="title"/>
+                    <text macro="container-title"/>
+                  </group>
+                  <group delimiter="; " prefix="(" suffix=")">
+                    <text macro="translator"/>
+                    <text macro="volumes"/>
+                    <text macro="secondary-contributors"/>
+                    <text macro="collection"/>
+                    <text macro="edition"/>
+                    <text macro="issue-note"/>
+                  </group>
+                  <text macro="point-locators"/>
+                </if>
+                <else-if type="entry-encyclopedia entry-dictionary" match="any">
+                  <group delimiter=", ">
+                    <text macro="contributors"/>
+                    <text macro="title"/>
+                    <text macro="container-title"/>
+                    <text macro="point-locators"/>
+                  </group>
+                </else-if>
+                <else-if type="webpage post" match="any">
+                  <group delimiter=", ">
+                    <text macro="contributors"/>
+                    <text macro="title"/>
+                    <text macro="webpage-title"/>
+                    <text macro="webpage-information"/>
+                  </group>
+                </else-if>
+              </choose>
+            </else>
           </choose>
         </else>
       </choose>
diff --git a/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl b/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl
index c6fd0428d16..9d40c019545 100644
--- a/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl
+++ b/buildres/csl/csl-styles/harvard-cite-them-right-no-et-al.csl
@@ -156,7 +156,7 @@
           </group>
         </group>
       </else-if>
-      <else-if type="article-newspaper article-magazine" match="none">
+      <else-if type="article-journal article-newspaper article-magazine" match="none">
         <group delimiter=" ">
           <group delimiter=", ">
             <choose>
diff --git a/buildres/csl/csl-styles/journal-of-consumer-research.csl b/buildres/csl/csl-styles/journal-of-consumer-research.csl
index 1f4389de87e..c53b7a1e33f 100644
--- a/buildres/csl/csl-styles/journal-of-consumer-research.csl
+++ b/buildres/csl/csl-styles/journal-of-consumer-research.csl
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US" page-range-format="chicago">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="chicago" default-locale="en-US">
   <info>
     <title>Journal of Consumer Research</title>
+    <title-short>JCR</title-short>
     <id>http://www.zotero.org/styles/journal-of-consumer-research</id>
     <link href="http://www.zotero.org/styles/journal-of-consumer-research" rel="self"/>
     <link href="http://www.zotero.org/styles/international-studies-association" rel="template"/>
-    <link href="http://www.ejcr.org/newstylesheet.pdf" rel="documentation"/>
+    <link href="https://consumerresearcher.com/manuscript-preparation" rel="documentation"/>
+    <link href="https://consumerresearcher.com/wp-content/uploads/2021/01/stylesheet.pdf" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
     <category citation-format="author-date"/>
     <category field="social_science"/>
     <issn>0093-5301</issn>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <eissn>1537-5277</eissn>
+    <updated>2021-04-01T06:57:26+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor">
@@ -33,7 +36,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter=", " initialize-with=". " sort-separator=", "/>
+      <name form="short" and="text" delimiter-precedes-last="never" initialize-with=". "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -148,6 +151,7 @@
   <bibliography hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;">
     <sort>
       <key macro="author"/>
+      <key macro="year-date"/>
       <key variable="title"/>
     </sort>
     <layout suffix=".">
diff --git a/buildres/csl/csl-styles/methods-of-information-in-medicine.csl b/buildres/csl/csl-styles/methods-of-information-in-medicine.csl
index b711c6b9a51..cfb3d4c552c 100644
--- a/buildres/csl/csl-styles/methods-of-information-in-medicine.csl
+++ b/buildres/csl/csl-styles/methods-of-information-in-medicine.csl
@@ -19,7 +19,7 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>0026-1270</issn>
-    <updated>2020-06-05T09:29:34+00:00</updated>
+    <updated>2021-04-08T14:57:03+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -41,7 +41,7 @@
   <macro name="editor">
     <names variable="editor">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix=". "/>
+      <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="publisher">
@@ -140,9 +140,11 @@
             </group>
           </if>
           <else-if type="chapter paper-conference" match="any">
-            <group prefix=" ">
-              <text term="in" suffix=": " text-case="capitalize-first"/>
-              <text macro="editor"/>
+            <group delimiter=". " prefix=" ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
               <text variable="container-title"/>
               <group delimiter=":">
                 <group delimiter="; ">
diff --git a/buildres/csl/csl-styles/presses-universitaires-de-paris-nanterre.csl b/buildres/csl/csl-styles/presses-universitaires-de-paris-nanterre.csl
index 46a2a2bc6c5..ca2449c7d91 100644
--- a/buildres/csl/csl-styles/presses-universitaires-de-paris-nanterre.csl
+++ b/buildres/csl/csl-styles/presses-universitaires-de-paris-nanterre.csl
@@ -197,6 +197,12 @@
       </else-if>
     </choose>
   </macro>
+  <macro name="locators">
+    <group delimiter=".&#160;">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
   <macro name="yearpage-bib">
     <choose>
       <if type="bill book graphic legal_case motion_picture paper-conference report song speech thesis" match="any">
@@ -212,10 +218,7 @@
             </group>
             <text variable="number-of-pages" suffix="&#160;p"/>
           </group>
-          <group>
-            <label variable="locator" form="short"/>
-            <text variable="locator"/>
-          </group>
+          <text macro="locators"/>
         </group>
       </if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
@@ -349,7 +352,7 @@
         <if position="ibid-with-locator">
           <group delimiter=", ">
             <text term="ibid" text-case="capitalize-first" font-style="italic" suffix="."/>
-            <text variable="locator" prefix="p. "/>
+            <text macro="locators"/>
           </group>
         </if>
         <else-if position="ibid">
@@ -368,7 +371,7 @@
                 <text value="art cit"/>
               </else>
             </choose>
-            <text variable="locator" prefix="p.&#160;"/>
+            <text macro="locators"/>
           </group>
         </else-if>
         <else>
diff --git a/buildres/csl/csl-styles/refugee-survey-quarterly.csl b/buildres/csl/csl-styles/refugee-survey-quarterly.csl
new file mode 100644
index 00000000000..9c404933c34
--- /dev/null
+++ b/buildres/csl/csl-styles/refugee-survey-quarterly.csl
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="symbol" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <info>
+    <title>Refugee Survey Quarterly</title>
+    <id>http://www.zotero.org/styles/refugee-survey-quarterly</id>
+    <link href="http://www.zotero.org/styles/refugee-survey-quarterly" rel="self"/>
+    <link href="http://www.zotero.org/styles/henoch" rel="template"/>
+    <link href="https://academic.oup.com/rsq/pages/information_for_authors" rel="documentation"/>
+    <link href="https://static.primary.prod.gcms.the-infra.com/static/site/rsq/document/rsq-style-sheet-for-authors.pdf?node=9f756c3cee0c555986ff&amp;version=78284:309db0246a9285b2f409" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="history"/>
+    <issn>1020-4067</issn>
+    <eissn>1471-695X</eissn>
+    <updated>2021-03-28T08:30:53+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="translator" form="short">trans.</term>
+      <term name="editortranslator" form="short">ed. and trans.</term>
+      <term name="chapter" form="short">c.</term>
+      <term name="open-quote">"</term>
+      <term name="close-quote">"</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author" suffix=", ">
+      <name initialize-with="."/>
+      <et-al font-style="italic"/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="false"/>
+      <substitute>
+        <names variable="translator"/>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="false"/>
+      <substitute>
+        <names variable="translator"/>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor-translator">
+    <choose>
+      <if variable="editor translator" match="any">
+        <names variable="editor translator">
+          <label form="short" suffix=". " strip-periods="false"/>
+          <name and="text" initialize-with="."/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-editor">
+    <group delimiter=" ">
+      <text term="in" suffix=" "/>
+      <names variable="editor">
+        <name initialize-with="."/>
+        <label form="short" prefix=" (" suffix=")" strip-periods="false"/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <names variable="container-author"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" form="short" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection">
+    <text variable="collection-title"/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="paper-conference">
+        <group delimiter=" ">
+          <text term="presented at"/>
+          <text variable="event"/>
+        </group>
+        <text variable="event-place" prefix=", "/>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-newspaper" match="any">
+        <date form="text" date-parts="year-month-day" variable="issued"/>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volumes">
+    <group delimiter=" ">
+      <text variable="number-of-volumes"/>
+      <text term="volume" form="short" plural="true" strip-periods="true"/>
+    </group>
+  </macro>
+  <macro name="pageno">
+    <choose>
+      <if variable="locator" match="none">
+        <text variable="page"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pageref">
+    <choose>
+      <if variable="locator">
+        <group delimiter=" ">
+          <choose>
+            <if match="none" locator="page">
+              <label variable="locator" form="short"/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pageref-subsequent">
+    <label variable="locator" form="short" suffix=" "/>
+    <text variable="locator"/>
+  </macro>
+  <macro name="volref">
+    <text variable="volume"/>
+    <text variable="issue" prefix="(" suffix=")"/>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text variable="container-title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="container-title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog report article-newspaper" match="any">
+        <choose>
+          <if variable="URL" match="any">
+            <group delimiter=" ">
+              <group delimiter=": ">
+                <text term="available at"/>
+                <text variable="URL" prefix=" " suffix=", "/>
+              </group>
+              <group delimiter=" " prefix="(" suffix=")">
+                <text term="accessed"/>
+                <date variable="accessed">
+                  <date-part name="month" form="numeric" suffix="/"/>
+                  <date-part name="day" suffix="/"/>
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="ibid-with-locator ibid" match="any">
+          <group delimiter=", ">
+            <text term="ibid" form="short" text-case="capitalize-first" font-style="italic"/>
+            <text macro="pageref"/>
+          </group>
+        </if>
+        <else-if match="any" position="subsequent">
+          <group delimiter=", ">
+            <text macro="author-short"/>
+            <text macro="title-short"/>
+            <text macro="pageref-subsequent"/>
+          </group>
+        </else-if>
+        <else>
+          <text macro="author"/>
+          <choose>
+            <if type="report thesis" match="any">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text variable="genre"/>
+                <text variable="publisher"/>
+                <text variable="number" prefix=" "/>
+                <text variable="collection-title"/>
+                <text macro="date"/>
+                <text macro="pageref"/>
+                <text macro="access"/>
+              </group>
+            </if>
+            <else-if type="bill book graphic legal_case motion_picture song" match="any">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text macro="editor-translator"/>
+                <text macro="container"/>
+                <text macro="volumes"/>
+                <text macro="collection"/>
+                <text macro="volref"/>
+                <text macro="publisher"/>
+                <text macro="date"/>
+                <text macro="pageref"/>
+              </group>
+            </else-if>
+            <else-if type="chapter paper-conference" match="any">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text macro="container-editor"/>
+                <text macro="container"/>
+                <text macro="volref"/>
+                <text macro="volumes"/>
+                <text macro="collection"/>
+                <text macro="publisher"/>
+                <text macro="date"/>
+                <text macro="pageno"/>
+                <text macro="pageref"/>
+              </group>
+            </else-if>
+            <else>
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text macro="publisher"/>
+                <text macro="container"/>
+                <text macro="collection"/>
+                <text macro="volref"/>
+                <text macro="date"/>
+                <text macro="volumes"/>
+                <text macro="pageno"/>
+                <text macro="pageref"/>
+                <text macro="access"/>
+              </group>
+            </else>
+          </choose>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+</style>
diff --git a/buildres/csl/csl-styles/revue-archeologique.csl b/buildres/csl/csl-styles/revue-archeologique.csl
index ebea35a418b..8378798492c 100644
--- a/buildres/csl/csl-styles/revue-archeologique.csl
+++ b/buildres/csl/csl-styles/revue-archeologique.csl
@@ -213,7 +213,7 @@
             <else-if type="entry-dictionary entry-encyclopedia" match="any">
               <group delimiter=", ">
                 <text macro="title" quotes="true"/>
-                <text variable="title" form="short" font-style="italic"/>
+                <text variable="container-title" form="short" font-style="italic"/>
                 <group delimiter="&#160;">
                   <label variable="volume" form="short"/>
                   <text variable="volume"/>
diff --git a/buildres/csl/csl-styles/taylor-and-francis-council-of-science-editors-author-date.csl b/buildres/csl/csl-styles/taylor-and-francis-council-of-science-editors-author-date.csl
index 15973a0b30c..7621c52ded0 100644
--- a/buildres/csl/csl-styles/taylor-and-francis-council-of-science-editors-author-date.csl
+++ b/buildres/csl/csl-styles/taylor-and-francis-council-of-science-editors-author-date.csl
@@ -13,7 +13,7 @@
     <category citation-format="author-date"/>
     <category field="science"/>
     <summary>The Council of Science Editors style for T&amp;F journals as per guidelines (version 2.0, 18 Jan 2018).</summary>
-    <updated>2019-10-30T11:30:54+00:00</updated>
+    <updated>2021-04-09T11:30:54+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor-translator">
@@ -37,7 +37,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" delimiter=", " initialize-with="." and="symbol"/>
+      <name form="short" delimiter=", " initialize-with="." and="text"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
diff --git a/buildres/csl/csl-styles/triangle.csl b/buildres/csl/csl-styles/triangle.csl
index 7d3e1bdd311..eefba067154 100644
--- a/buildres/csl/csl-styles/triangle.csl
+++ b/buildres/csl/csl-styles/triangle.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-FR" version="1.0" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="expanded" default-locale="fr-FR">
   <info>
     <title>Triangle (Français)</title>
     <id>http://www.zotero.org/styles/triangle</id>
@@ -20,7 +20,7 @@
     <category field="social_science"/>
     <summary>Derived from Style EHESS-histoire, available at http://www.boiteaoutils.info/2011/06/styles-francais-de-citation-sous-zotero.html
 		First version online in november 2012. Changes made to cover more documents types and to lighten URLS display. Should preferably be used ticking the quoting option (preferences/citer/styles): include URLs addresses in references.</summary>
-    <updated>2016-07-19T04:10:55+00:00</updated>
+    <updated>2021-04-07T01:50:30+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="fr">
@@ -239,6 +239,17 @@
           </group>
         </group>
       </if>
+      <else-if type="chapter" match="any">
+        <group delimiter=", " font-style="normal">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <group delimiter=" " font-style="normal">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
       <else-if type="entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=" " font-style="normal">
           <date variable="issued">
@@ -251,7 +262,7 @@
           </group>
         </group>
       </else-if>
-      <else-if type="article-journal chapter article-newspaper article-magazine" match="any">
+      <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter=" " font-style="normal">
           <label variable="page" form="short"/>
           <text variable="page"/>
diff --git a/buildres/csl/csl-styles/university-of-tasmania-simplified-author-date.csl b/buildres/csl/csl-styles/university-of-tasmania-simplified-author-date.csl
new file mode 100644
index 00000000000..c95ba4324f7
--- /dev/null
+++ b/buildres/csl/csl-styles/university-of-tasmania-simplified-author-date.csl
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-GB">
+  <info>
+    <title>University of Tasmania - Simplified Author-date</title>
+    <id>http://www.zotero.org/styles/university-of-tasmania-simplified-author-date</id>
+    <link href="http://www.zotero.org/styles/university-of-tasmania-simplified-author-date" rel="self"/>
+    <link href="https://utas.libguides.com/referencing/simplified_authordate" rel="documentation"/>
+    <author>
+      <name>Zephyr Apsara Ganesh</name>
+      <email>zaganesh@utas.edu.au</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2021-03-29T11:30:00+11:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="long" name-as-sort-order="all" sort-separator=" " initialize-with="" and="symbol"/>
+      <substitute>
+        <choose>
+          <if type="bill legal_case legislation" match="any">
+            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          </if>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="day" form="numeric-leading-zeros" suffix=" "/>
+          <date-part name="month" form="short" strip-periods="true" suffix=" "/>
+          <date-part name="year" form="long"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" text-case="title"/>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" prefix=", " suffix=" "/>
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+        </names>
+        <group delimiter=", ">
+          <text variable="container-title" text-case="title"/>
+          <text variable="collection-title" text-case="title"/>
+        </group>
+      </if>
+      <else-if type="bill graphic legal_case legislation motion_picture song" match="any">
+        <group prefix=", " delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number variable="edition" form="ordinal"/>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+      <text value="edn"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="container-title" font-style="italic"/>
+          </group>
+          <group>
+            <text variable="volume" prefix="vol."/>
+          </group>
+          <text variable="page" prefix="no."/>
+        </group>
+      </if>
+      <else-if type="bill report book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <group delimiter=", " prefix=", ">
+          <text macro="publisher" suffix="."/>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", " prefix=". ">
+          <text macro="publisher"/>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <text variable="number" prefix=". "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if variable="URL">
+        <text variable="URL"/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" cite-group-delimiter=", ">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="3" et-al-use-first="1" hanging-indent="true" entry-spacing="0" line-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout>
+      <group>
+        <text macro="author-short"/>
+        <text macro="issued" prefix=", "/>
+        <group prefix=", ">
+          <choose>
+            <if type="chapter article-journal" match="any">
+              <text macro="title" prefix=" '" suffix="'"/>
+              <text macro="edition" prefix=", "/>
+              <text macro="container"/>
+            </if>
+            <else>
+              <text macro="title" font-style="italic"/>
+            </else>
+          </choose>
+          <text macro="locators"/>
+        </group>
+      </group>
+      <choose>
+        <if type="article article-magazine article-newspaper article-journal bill book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure graphic interview legislation legal_case manuscript map motion_picture musical_score pamphlet paper-conference patent post post-weblog personal_communication review review-book song speech thesis treaty" match="none">
+          <text variable="title-short" prefix=", "/>
+          <text macro="access" prefix=", "/>
+        </if>
+        <else>
+          <text macro="access" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>