diff --git a/.github/workflows/label-gun.yml b/.github/workflows/label-gun.yml
new file mode 100644
index 00000000000..d4d022673f8
--- /dev/null
+++ b/.github/workflows/label-gun.yml
@@ -0,0 +1,16 @@
+name: 'Automated tagging for PRs and issues'
+
+on:
+  issues:
+    types: [opened, edited, closed]
+  issue_comment:
+    types: [created, edited, closed]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: retorquere/label-gun@main
+        with:
+          token: ${{ github.token }}
+          label.awaiting: "waiting-for-response-from-contributor"
diff --git a/american-journal-of-archaeology.csl b/american-journal-of-archaeology.csl
index 588cb148ae6..b693ac62757 100644
--- a/american-journal-of-archaeology.csl
+++ b/american-journal-of-archaeology.csl
@@ -353,7 +353,7 @@
       <key variable="issued"/>
       <key macro="contributors-short"/>
     </sort>
-    <layout delimiter="; ">
+    <layout delimiter="; " suffix=".">
       <group delimiter=", ">
         <group delimiter=" ">
           <text macro="contributors-short"/>
diff --git a/american-medical-association-alphabetical.csl b/american-medical-association-alphabetical.csl
index 02ddf786ef4..cb323e4ca10 100644
--- a/american-medical-association-alphabetical.csl
+++ b/american-medical-association-alphabetical.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, with alphabetically sorted bibliography. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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="page-range-delimiter">-</term>      
+      <term name="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -252,6 +252,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
diff --git a/american-medical-association-brackets.csl b/american-medical-association-brackets.csl
index d5d468ec371..ed90ed3bd64 100644
--- a/american-medical-association-brackets.csl
+++ b/american-medical-association-brackets.csl
@@ -27,7 +27,7 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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">
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -247,6 +247,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
diff --git a/american-medical-association-no-et-al.csl b/american-medical-association-no-et-al.csl
index 1d591d11272..1b784c4ce5f 100644
--- a/american-medical-association-no-et-al.csl
+++ b/american-medical-association-no-et-al.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, without et al. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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="page-range-delimiter">-</term>      
+      <term name="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -247,6 +247,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
diff --git a/american-medical-association-no-url.csl b/american-medical-association-no-url.csl
index 32e195847b5..dbe940a2173 100644
--- a/american-medical-association-no-url.csl
+++ b/american-medical-association-no-url.csl
@@ -27,12 +27,12 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA, without the URL. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T13:38:04+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="page-range-delimiter">-</term>      
+      <term name="page-range-delimiter">-</term>
       <term name="presented at">presented at</term>
     </terms>
   </locale>
@@ -56,7 +56,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -217,6 +217,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
diff --git a/american-medical-association.csl b/american-medical-association.csl
index 44520822d04..b36bbb5488e 100644
--- a/american-medical-association.csl
+++ b/american-medical-association.csl
@@ -27,7 +27,7 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>The American Medical Association style as used in JAMA. Version 11 as per November-2019.</summary>
-    <updated>2021-10-28T13:38:04+00:00</updated>
+    <updated>2022-03-17T08:48: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">
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </if>
       <else>
@@ -247,6 +247,15 @@
             <text variable="event-place"/>
           </group>
         </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
         <else>
           <text macro="editor" prefix=" " suffix="."/>
           <group prefix=" " suffix=".">
diff --git a/american-physics-society.csl b/american-physics-society.csl
index e5a28cce9a4..e78b1fe8357 100644
--- a/american-physics-society.csl
+++ b/american-physics-society.csl
@@ -15,15 +15,18 @@
     <author>
       <name>Brenton M. Wiernik</name>
     </author>
+    <contributor>
+      <name>Anna C. Véron</name>
+    </contributor>
     <category citation-format="numeric"/>
     <category field="physics"/>
     <summary>Common style use by APS publications.</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-03-02T11:58: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="author">
     <names variable="author">
-      <name delimiter=", " initialize-with=". " and="text"/>
+      <name and="text" et-al-min="11" et-al-use-first="1" initialize-with=". " delimiter=", "/>
       <label form="long" prefix=", " suffix=" "/>
       <substitute>
         <names variable="editor"/>
diff --git a/american-sociological-association.csl b/american-sociological-association.csl
index 6657716cde8..00928a675a8 100644
--- a/american-sociological-association.csl
+++ b/american-sociological-association.csl
@@ -130,6 +130,12 @@
           <date variable="issued" form="numeric" date-parts="year"/>
         </group>
       </if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
       <else>
         <text term="no date" form="short"/>
       </else>
@@ -140,6 +146,12 @@
       <if variable="issued">
         <date variable="issued" form="numeric" date-parts="year"/>
       </if>
+      <else-if variable="status">
+        <group>
+          <text variable="status" text-case="lowercase"/>
+          <text variable="year-suffix" prefix="-"/>
+        </group>
+      </else-if>
       <else>
         <text term="no date" form="short"/>
       </else>
diff --git a/archaeonautica.csl b/archaeonautica.csl
index 5954a1d8c7f..1340f1c0021 100644
--- a/archaeonautica.csl
+++ b/archaeonautica.csl
@@ -9,7 +9,7 @@
     <link href="https://journals.openedition.org/archaeonautica/279" rel="documentation"/>
     <author>
       <name>Antonio Mendes da Silva</name>
-      <email>mendes@mmsh.univ-aix.fr</email>
+      <email>antonio.mendes@cnrs.fr</email>
     </author>
     <category citation-format="author-date"/>
     <category field="humanities"/>
@@ -18,7 +18,7 @@
     <eissn>2117-6973</eissn>
     <summary>Style conçu pour la revue Archaeonautica. L’archéologie maritime et navale de la
             préhistoire à l’époque contemporaine. Centre Camille Jullian, CNRS</summary>
-    <updated>2020-05-04T12:23:43+00:00</updated>
+    <updated>2020-05-10T04:06:42+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">
@@ -346,8 +346,9 @@
     </choose>
   </macro>
   <macro name="year-date">
+    <!-- Une tabulation après la date -->
     <group suffix="&#9;">
-      <!-- Une tabulation après la date -->
+      <!-- Fin de la tabulation -->
       <choose>
         <if variable="issued">
           <date variable="issued">
@@ -462,19 +463,28 @@
       </date>
     </group>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&amp;#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
+  <macro name="archive">
+    <group suffix="." prefix=". ">
+      <group delimiter=", ">
+        <text variable="archive"/>
+        <text variable="archive_location"/>
+        <text variable="call-number"/>
+      </group>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="&#160;; " name-delimiter=", " initialize-with=". " delimiter-precedes-last="never" name-as-sort-order="all" sort-separator=" ">
     <sort>
       <key variable="issued" sort="descending"/>
       <key macro="author-citation"/>
       <key macro="title"/>
     </sort>
-    <layout delimiter="&amp;#160;; ">
-      <group delimiter=",&amp;#160;">
+    <layout delimiter="&#160;; " prefix="(" suffix=")">
+      <group delimiter=",&#160;">
         <group delimiter=" ">
           <text macro="author-citation"/>
           <text macro="year-date-short"/>
         </group>
-        <group delimiter="&amp;#160;">
+        <group delimiter="&#160;">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -500,6 +510,7 @@
         <text macro="publisher"/>
         <text macro="collection"/>
         <text macro="page-bib"/>
+        <text macro="archive"/>
       </group>
       <text macro="accessed"/>
     </layout>
diff --git a/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl b/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl
index d0ee2797c29..07ca846cca7 100644
--- a/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl
+++ b/associacao-brasileira-de-normas-tecnicas-usp-fmvz.csl
@@ -6,7 +6,7 @@
     <id>http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz</id>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-usp-fmvz" rel="self"/>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas" rel="template"/>
-    <link href="http://biblioteca.fmvz.usp.br/wp-content/uploads/2018/10/DIRETRIZES_22outubro2018.pdf" rel="documentation"/>
+    <link href="https://drive.google.com/file/d/1aGzkTiQOADXYa809BAj_IHvl6_xgJKW9/view" rel="documentation"/>
     <author>
       <name>Alberto Massao Kawai</name>
       <email>alberto.kawai@gmail.com</email>
@@ -15,7 +15,7 @@
     <category citation-format="author-date"/>
     <category field="medicine"/>
     <summary>The Brazilian Standard Style in accordance with ABNT-NBR 10520.2002 and ABNT-NBR 6023.2002</summary>
-    <updated>2018-10-18T13:57:18+00:00</updated>
+    <updated>2022-04-05T16:21:57+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="pt-BR">
@@ -46,41 +46,13 @@
       </term>
     </terms>
   </locale>
-  <macro name="container-contributors">
-    <choose>
-      <if type="chapter">
-        <names variable="container-author" delimiter=", ">
-          <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given" text-case="uppercase"/>
-          </name>
-          <label form="short" plural="never" text-case="capitalize-first" font-style="normal" prefix=" (" suffix=".)."/>
-          <substitute>
-            <names variable="editor"/>
-            <names variable="collection-editor"/>
-          </substitute>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <if type="chapter" match="none">
-        <names variable="editor" delimiter="; " prefix=" (" suffix=")">
-          <name initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
-        </names>
-      </if>
-    </choose>
-  </macro>
-  <macro name="translator">
-    <text value="Traducao "/>
-    <names variable="translator" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always">
-        <name-part name="given" text-case="capitalize-first"/>
-        <name-part name="family" text-case="capitalize-first"/>
-      </name>
-    </names>
+  <macro name="access">
+    <text variable="URL" prefix="Disponível em: &lt;" suffix="&gt;."/>
+    <date variable="accessed" prefix=". Acesso em: " suffix=".">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
+      <date-part name="year"/>
+    </date>
   </macro>
   <macro name="author">
     <names variable="author" font-variant="normal">
@@ -102,6 +74,7 @@
         <name-part name="family" text-case="uppercase"/>
         <name-part name="given" text-case="uppercase"/>
       </name>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -116,34 +89,30 @@
       </substitute>
     </names>
   </macro>
-  <macro name="access">
-    <text variable="URL" prefix="Disponível em: &lt;" suffix="&gt;."/>
-    <date variable="accessed" prefix=". Acesso em: " suffix=".">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
-      <date-part name="year"/>
-    </date>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
   </macro>
-  <macro name="title">
+  <macro name="collection-title">
+    <text variable="collection-title"/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <macro name="container-contributors">
     <choose>
-      <if type="chapter bill" match="any">
-        <text variable="title"/>
+      <if type="chapter">
+        <names variable="container-author" delimiter=", ">
+          <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given" text-case="uppercase"/>
+          </name>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="collection-editor"/>
+          </substitute>
+        </names>
       </if>
-      <else-if type="book thesis" match="any">
-        <text variable="title" font-weight="bold"/>
-      </else-if>
-      <else-if type="article-journal" match="any">
-        <text variable="title" text-case="title" font-weight="normal"/>
-      </else-if>
-      <else-if type="article-newspaper article-magazine" match="any">
-        <text variable="title" text-case="capitalize-first"/>
-      </else-if>
-      <else-if type="paper-conference" match="any">
-        <text variable="title" suffix=". "/>
-      </else-if>
-      <else>
-        <text variable="title" font-weight="bold"/>
-      </else>
     </choose>
   </macro>
   <macro name="container-title">
@@ -156,31 +125,18 @@
       </else>
     </choose>
   </macro>
-  <macro name="publisher">
+  <macro name="edition">
     <choose>
-      <if match="any" variable="publisher">
-        <choose>
-          <if variable="publisher-place">
-            <text variable="publisher-place" suffix=": "/>
-          </if>
-          <else-if type="entry-encyclopedia"/>
-          <else>
-            <text value="[s.l.] "/>
-          </else>
-        </choose>
+      <if type="book chapter" match="any">
         <choose>
-          <if variable="publisher">
-            <text variable="publisher" suffix=", "/>
-            <text macro="issued"/>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="numeric" suffix="."/>
+              <text term="edition" form="short" suffix="."/>
+            </group>
           </if>
-          <else>
-            <text value="[s.n.]"/>
-          </else>
         </choose>
       </if>
-      <else>
-        <text value="[s.l: s.n.]"/>
-      </else>
     </choose>
   </macro>
   <macro name="event">
@@ -194,7 +150,6 @@
           <else>
             <group delimiter=" ">
               <text variable="genre" text-case="capitalize-first"/>
-              <text term="presented at"/>
               <text variable="event"/>
             </group>
           </else>
@@ -227,7 +182,7 @@
   <macro name="issued-year">
     <choose>
       <if variable="issued" match="all">
-        <date date-parts="year" form="numeric" variable="issued" prefix=" " suffix=". ">
+        <date date-parts="year" form="numeric" variable="issued" prefix=" ">
           <date-part name="year"/>
         </date>
       </if>
@@ -236,38 +191,9 @@
       </else>
     </choose>
   </macro>
-  <macro name="edition">
-    <choose>
-      <if type="book chapter" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="numeric" suffix="."/>
-              <text term="edition" form="short" suffix="."/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" suffix=" ed."/>
-          </else>
-        </choose>
-      </if>
-      <else-if type="paper-conference" match="any"/>
-    </choose>
-  </macro>
   <macro name="locators">
     <choose>
-      <if type="bill">
-        <group prefix=". " delimiter=", ">
-          <date variable="issued">
-            <date-part name="day"/>
-            <date-part prefix=" " name="month" form="short"/>
-            <date-part prefix=" " name="year"/>
-          </date>
-          <text variable="section" prefix="Sec. "/>
-          <text variable="page" prefix="p. " suffix="."/>
-        </group>
-      </if>
-      <else-if match="any" type="article-journal article-magazine article-newspaper">
+      <if match="any" type="article-journal article-magazine article-newspaper">
         <group delimiter=", ">
           <group delimiter=", ">
             <text variable="volume" prefix="v. "/>
@@ -275,63 +201,106 @@
           </group>
           <text variable="page" prefix="p. "/>
         </group>
+      </if>
+      <else-if match="any" type="paper-conference">
+        <group delimiter=", ">
+          <group delimiter=", ">
+            <text variable="volume" prefix="v. "/>
+          </group>
+          <text variable="page" prefix="p. " suffix=". "/>
+        </group>
       </else-if>
       <else-if match="any" type="book">
         <group delimiter=", ">
           <group>
             <text variable="volume" prefix="v. "/>
-            <text variable="page" suffix=" p."/>
+            <text variable="number-of-pages" suffix=" p."/>
           </group>
         </group>
       </else-if>
       <else-if type="chapter" match="any">
-        <group>
-          <group>
-            <text variable="volume"/>
-            <text variable="page" prefix="p. "/>
-          </group>
-        </group>
+        <text variable="page" prefix="p. "/>
       </else-if>
       <else-if type="thesis" match="any">
         <group>
           <group>
-            <text variable="volume"/>
             <text variable="page" suffix=" f."/>
           </group>
         </group>
       </else-if>
-      <else-if type="paper-conference" match="any"/>
     </choose>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title"/>
-    <text variable="collection-number" prefix=" "/>
-  </macro>
-  <macro name="genre">
-    <text variable="issue"/>
+  <macro name="publisher">
+    <choose>
+      <if match="any" variable="publisher">
+        <choose>
+          <if variable="publisher-place">
+            <text variable="publisher-place" suffix=": "/>
+          </if>
+          <else-if type="entry-encyclopedia"/>
+          <else>
+            <text value="[s.l.] "/>
+          </else>
+        </choose>
+        <choose>
+          <if variable="publisher">
+            <text variable="publisher" suffix=", "/>
+            <text macro="issued"/>
+          </if>
+          <else>
+            <text value="[s.n.]"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text value="[s.l: s.n.]"/>
+      </else>
+    </choose>
   </macro>
-  <macro name="citation-locator">
-    <group>
-      <label variable="locator" form="short"/>
-      <text variable="locator" prefix=" "/>
-    </group>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter" match="none">
+        <names variable="editor" delimiter="; " prefix=" (" suffix=")">
+          <name initialize-with=". " delimiter=", "/>
+        </names>
+      </if>
+    </choose>
   </macro>
-  <macro name="place">
+  <macro name="title">
     <choose>
-      <if match="any" variable="publisher-place">
-        <text variable="publisher-place"/>
+      <if type="chapter" match="any">
+        <text variable="title"/>
       </if>
+      <else-if type="book thesis" match="any">
+        <text variable="title" font-weight="bold"/>
+      </else-if>
+      <else-if type="article-journal bill" match="any">
+        <text variable="title" text-case="title" font-weight="normal"/>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text variable="title" text-case="capitalize-first"/>
+      </else-if>
+      <else-if type="paper-conference" match="any">
+        <text variable="title" suffix=". "/>
+      </else-if>
+      <else>
+        <text variable="title" font-weight="bold"/>
+      </else>
     </choose>
   </macro>
-  <macro name="archive">
-    <group>
-      <text variable="archive" prefix=" "/>
-    </group>
+  <macro name="translator">
+    <text value="Tradução "/>
+    <names variable="translator" delimiter="; ">
+      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always">
+        <name-part name="given" text-case="capitalize-first"/>
+        <name-part name="family" text-case="capitalize-first"/>
+      </name>
+    </names>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" collapse="year" disambiguate-add-year-suffix="true">
     <sort>
-      <key macro="issued-year"/>
       <key macro="author"/>
+      <key macro="issued-year"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group>
@@ -341,29 +310,34 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1">
+  <bibliography>
     <sort>
       <key macro="author"/>
       <key variable="issued"/>
     </sort>
     <layout>
       <choose>
-        <if type="bill">
+        <if type="article-newspaper article-magazine article-journal" match="any">
           <group>
-            <text macro="author" text-case="uppercase" font-variant="normal" suffix=". "/>
-            <text variable="number" suffix=". "/>
+            <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text variable="references" font-weight="bold"/>
-            <text variable="note"/>
-            <text macro="locators" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text variable="collection-title" suffix=". "/>
+            <text macro="edition" suffix=", "/>
+            <text macro="locators" suffix=", "/>
+            <text macro="issued"/>
+            <text macro="access"/>
           </group>
         </if>
-        <else-if type="map">
+        <else-if type="bill">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=", "/>
+            <text macro="title" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="edition" suffix=", "/>
+            <text macro="locators" suffix=", "/>
             <text macro="issued"/>
-            <text variable="note" suffix=". "/>
+            <text macro="access"/>
           </group>
         </else-if>
         <else-if type="book">
@@ -381,8 +355,9 @@
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="secondary-contributors" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": "/>
+            <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
             <text macro="container-contributors" suffix=". "/>
+            <text variable="genre" prefix="(" suffix=".). "/>
             <text macro="container-title" suffix=". "/>
             <text variable="collection-title" suffix=". "/>
             <text macro="translator" suffix=". "/>
@@ -391,28 +366,28 @@
             <text macro="locators" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="article-newspaper article-magazine article-journal" match="any">
+        <else-if type="entry-dictionary">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text variable="collection-title" suffix=". "/>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued"/>
+            <text macro="title"/>
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <text macro="container-title"/>
+            <text variable="collection-title" prefix=": " suffix=". "/>
+            <text macro="locators"/>
+            <text macro="event"/>
+            <text macro="publisher" prefix=". " suffix=". "/>
+            <text macro="collection-title" prefix="(Texto para discussao, n. " suffix=")."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="thesis">
+        <else-if type="entry-encyclopedia">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="issued-year"/>
-            <text macro="locators"/>
-            <text variable="publisher" prefix=" " suffix=","/>
-            <text variable="publisher-place" prefix=" " suffix=","/>
-            <text macro="issued-year"/>
-            <text macro="access"/>
+            <text macro="title"/>
+            <text variable="publisher-place" prefix=". " suffix=": "/>
+            <text variable="publisher" suffix=", "/>
+            <text macro="issued" prefix=", " suffix=". (Nota tecnica)."/>
           </group>
         </else-if>
         <else-if type="manuscript">
@@ -420,20 +395,48 @@
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="edition" suffix=". "/>
-            <text macro="place" suffix=", "/>
+            <text variable="publisher-place" suffix=", "/>
             <text macro="issued" suffix=". "/>
             <text macro="access" suffix=". "/>
-            <text macro="archive" suffix=". "/>
+            <text variable="archive" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="webpage">
+        <else-if type="map">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="genre" suffix=". "/>
-            <text macro="access" suffix=". "/>
+            <text macro="title" suffix=", "/>
+            <text macro="issued"/>
+            <text variable="note" suffix=". "/>
           </group>
         </else-if>
+        <else-if type="paper-conference">
+          <text macro="author" text-case="capitalize-all" suffix=". "/>
+          <text macro="title"/>
+          <text macro="container-contributors"/>
+          <text macro="secondary-contributors"/>
+          <text term="in" text-case="capitalize-first" prefix=" " suffix=": "/>
+          <text macro="container-title"/>
+          <text variable="issue" suffix="., "/>
+          <text macro="issued-year" suffix=", "/>
+          <text variable="publisher-place" suffix=". "/>
+          <text variable="genre" font-weight="bold"/>
+          <text value="[...]" prefix=" " suffix=". "/>
+          <text variable="publisher-place" prefix=" " suffix=": "/>
+          <text variable="publisher" suffix=", "/>
+          <text macro="issued-year" suffix=". "/>
+          <text macro="locators"/>
+        </else-if>
+        <else-if type="patent" match="any">
+          <text macro="author" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text variable="number" suffix=". "/>
+          <text variable="genre" suffix=". "/>
+          <date variable="issued" suffix=". ">
+            <date-part name="day" prefix="Concessão: " suffix=" "/>
+            <date-part name="month" form="short" suffix=" " text-case="lowercase"/>
+            <date-part name="year"/>
+          </date>
+        </else-if>
         <else-if type="report">
           <group>
             <text macro="author" suffix=". "/>
@@ -448,68 +451,40 @@
             <text macro="access" suffix="."/>
           </group>
         </else-if>
-        <else-if type="entry-dictionary">
+        <else-if type="thesis">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": " suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text macro="issued-year" suffix=". "/>
             <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <text macro="collection-title" prefix="(Texto para discussao, n. " suffix=")."/>
+            <text variable="publisher" prefix=" " suffix=","/>
+            <text variable="publisher-place" prefix=" " suffix=","/>
+            <text macro="issued-year" suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="entry-encyclopedia">
+        <else-if type="webpage">
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text variable="publisher-place" prefix=". " suffix=": "/>
-            <text variable="publisher" suffix=", "/>
-            <text macro="issued" prefix=", " suffix=". (Nota t?cnica)."/>
-          </group>
-        </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" text-case="capitalize-all" suffix=". "/>
-          <text macro="title"/>
-          <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
-          <text term="in" text-case="capitalize-first" prefix=" " suffix=": "/>
-          <text macro="container-title"/>
-          <text variable="edition" suffix="., "/>
-          <text variable="issue" suffix=", "/>
-          <text variable="publisher-place" suffix=". "/>
-          <text value="Anais" font-weight="bold"/>
-          <text value="..."/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
+            <text macro="title" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="access" suffix=". "/>
           </group>
-          <text variable="publisher-place" prefix=" " suffix=": "/>
-          <text variable="publisher" suffix=", "/>
-          <text macro="issued"/>
-          <text macro="access"/>
-          <text macro="locators"/>
         </else-if>
-        <else-if type="legislation" match="any"/>
-        <else-if type="legal_case" match="any"/>
-        <else-if type="patent" match="any"/>
         <else>
           <text macro="author" suffix=". "/>
           <text macro="title"/>
           <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
+          <text macro="secondary-contributors" suffix=". "/>
           <text macro="container-title"/>
-          <text variable="collection-title" prefix=": " suffix="."/>
+          <text variable="collection-title" prefix=": " suffix=". "/>
           <text macro="locators"/>
           <group delimiter=". " prefix=". " suffix=". ">
             <text macro="event"/>
           </group>
-          <text variable="publisher-place"/>
+          <text variable="publisher-place" suffix=". "/>
           <text variable="publisher" suffix=", "/>
-          <text macro="issued" prefix=", " suffix=". "/>
+          <text macro="issued"/>
           <text macro="access"/>
         </else>
       </choose>
diff --git a/bibtex.csl b/bibtex.csl
index 1dd01793b39..7151cd52182 100644
--- a/bibtex.csl
+++ b/bibtex.csl
@@ -13,7 +13,10 @@
       <email>karnesky+zotero@gmail.com</email>
       <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
     </contributor>
-    <category citation-format="author-date"/>
+    <contributor>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </contributor>
     <category field="generic-base"/>
     <updated>2012-09-14T21:22:32+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>
@@ -123,6 +126,7 @@
     <text variable="page"/>
   </macro>
   <macro name="edition">
+    <!-- This should probably be ordinal? -->
     <text variable="edition"/>
   </macro>
   <citation disambiguate-add-year-suffix="true" disambiguate-add-names="false" disambiguate-add-givenname="false" collapse="year">
@@ -143,19 +147,19 @@
       <text macro="zotero2bibtexType" prefix=" @"/>
       <group prefix="{" suffix=" }" delimiter=", ">
         <text macro="citeKey"/>
-        <text variable="publisher-place" prefix=" place={" suffix="}"/>
+        <text variable="publisher-place" prefix=" address={" suffix="}"/>
         <!--Fix This-->
         <text variable="chapter-number" prefix=" chapter={" suffix="}"/>
         <!--Fix This-->
         <text macro="edition" prefix=" edition={" suffix="}"/>
-        <!--Is this in CSL? <text variable="type" prefix=" type={" suffix="}"/>-->
+        <text variable="genre" prefix=" type={" suffix="}"/>
         <text variable="collection-title" prefix=" series={" suffix="}"/>
         <text macro="title" prefix=" title={" suffix="}"/>
         <text variable="volume" prefix=" volume={" suffix="}"/>
-        <!--Not in CSL<text variable="rights" prefix=" rights={" suffix="}"/>-->
+        <text variable="license" prefix=" rights={" suffix="}"/>
         <text variable="ISBN" prefix=" ISBN={" suffix="}"/>
         <text variable="ISSN" prefix=" ISSN={" suffix="}"/>
-        <!--Not in CSL <text variable="LCCN" prefix=" callNumber={" suffix="}"/>-->
+        <text variable="call-number" prefix=" callNumber={" suffix="}"/>
         <text variable="archive_location" prefix=" archiveLocation={" suffix="}"/>
         <text variable="URL" prefix=" url={" suffix="}"/>
         <text variable="DOI" prefix=" DOI={" suffix="}"/>
@@ -170,6 +174,9 @@
         <text macro="issued-month" prefix=" month={" suffix="}"/>
         <text macro="pages" prefix=" pages={" suffix="}"/>
         <text variable="collection-title" prefix=" collection={" suffix="}"/>
+        <text variable="keyword" prefix=" keywords={" suffix="}"/>
+        <text variable="language" prefix="language={" suffix="}"/>
+        <text variable="annote" prefix="annote={" suffix="}"/>
       </group>
     </layout>
   </bibliography>
diff --git a/cardiff-university-harvard.csl b/cardiff-university-harvard.csl
index 4a1df22e8e9..a3810c23159 100644
--- a/cardiff-university-harvard.csl
+++ b/cardiff-university-harvard.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Cardiff University - Harvard</title>
@@ -86,7 +86,7 @@
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent" match="any">
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent webpage" match="any">
         <text variable="title" font-style="italic"/>
       </if>
       <else>
diff --git a/cell.csl b/cell.csl
index 878f2104653..4c29acbd6bf 100644
--- a/cell.csl
+++ b/cell.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="en-US" demote-non-dropping-particle="sort-only" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
   <info>
     <title>Cell</title>
     <id>http://www.zotero.org/styles/cell</id>
@@ -57,6 +57,16 @@
       <label form="short" prefix=", "/>
     </names>
   </macro>
+  <macro name="doi">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <text variable="URL"/>
+      </else-if>
+    </choose>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <sort>
       <key macro="author-short" names-min="1" names-use-first="1"/>
@@ -87,10 +97,13 @@
           <if type="article article-magazine article-newspaper article-journal review" match="any">
             <text variable="title" suffix="."/>
             <text variable="container-title" form="short" text-case="title"/>
-            <group delimiter=", ">
+            <group delimiter=", " suffix=". ">
               <text variable="volume" font-style="italic"/>
               <text variable="page"/>
             </group>
+            <group>
+              <text macro="doi"/>
+            </group>
           </if>
           <else-if type="chapter paper-conference" match="any">
             <text variable="title" suffix="."/>
diff --git a/extracellular-vesicles-and-circulating-nucleic-acids.csl b/extracellular-vesicles-and-circulating-nucleic-acids.csl
new file mode 100644
index 00000000000..ebc9867911c
--- /dev/null
+++ b/extracellular-vesicles-and-circulating-nucleic-acids.csl
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="en-US">
+  <info>
+    <title>Extracellular Vesicles and Circulating Nucleic Acids</title>
+    <title-short>EVCNA</title-short>
+    <id>http://www.zotero.org/styles/extracellular-vesicles-and-circulating-nucleic-acids</id>
+    <link href="http://www.zotero.org/styles/extracellular-vesicles-and-circulating-nucleic-acids" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-journal-of-sonography" rel="template"/>
+    <link href="https://evcna.com/pages/view/author_instructions" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2767-6641</eissn>
+    <updated>2022-03-22T13:35:38+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="available at">available from</term>
+      <term name="accessed">last accessed on</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+        <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+        <et-al font-style="italic"/>
+        <label prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" " prefix="[" suffix="]">
+          <text variable="PMID" prefix="PMID: "/>
+          <text variable="DOI" prefix="DOI: "/>
+        </group>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <group delimiter=". ">
+          <group delimiter=": ">
+            <text term="available at" text-case="capitalize-first"/>
+            <text variable="URL"/>
+          </group>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed">
+              <date-part name="month" suffix=" "/>
+              <date-part name="day" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" font-style="normal"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup" prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="title" prefix=" " suffix="."/>
+        <choose>
+          <if type="bill book graphic legislation motion_picture report song" match="any">
+            <group delimiter=" " suffix=".">
+              <text macro="edition"/>
+              <text macro="editor" prefix="(" suffix=")"/>
+            </group>
+            <group delimiter="; " suffix=".">
+              <text prefix=" " macro="publisher"/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="page" prefix=":"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
+              <group prefix=" " delimiter=", " suffix=".">
+                <text variable="container-title" font-style="normal" prefix=" "/>
+                <text variable="volume" prefix="Vol "/>
+                <text macro="edition" prefix=" "/>
+              </group>
+              <group delimiter="; " suffix=".">
+                <text macro="publisher" prefix=" "/>
+                <group delimiter=". " suffix=".">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <group delimiter=" ">
+                    <label variable="page" form="short"/>
+                    <text variable="page"/>
+                  </group>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper">
+            <text variable="container-title" font-style="italic" suffix=". "/>
+            <choose>
+              <if variable="URL">
+                <group delimiter=". " suffix=".">
+                  <text variable="URL"/>
+                  <group prefix="Published ">
+                    <date variable="issued">
+                      <date-part name="month" suffix=" "/>
+                      <date-part name="day" suffix=", "/>
+                      <date-part name="year"/>
+                    </date>
+                  </group>
+                  <group>
+                    <text term="accessed" text-case="capitalize-first" suffix=" "/>
+                    <date variable="accessed">
+                      <date-part name="month" suffix=" "/>
+                      <date-part name="day" suffix=", "/>
+                      <date-part name="year"/>
+                    </date>
+                  </group>
+                </group>
+              </if>
+              <else>
+                <group delimiter=":" suffix=".">
+                  <group>
+                    <date variable="issued">
+                      <date-part name="month" suffix=" "/>
+                      <date-part name="day" suffix=", "/>
+                      <date-part name="year"/>
+                    </date>
+                  </group>
+                  <text variable="page"/>
+                </group>
+              </else>
+            </choose>
+          </else-if>
+          <else-if type="legal_case">
+            <group delimiter=" " suffix=",">
+              <text macro="editor" prefix="(" suffix=")"/>
+            </group>
+            <group prefix=" " delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="page" prefix=", " suffix=" "/>
+            <group prefix="(" suffix=")." delimiter=" ">
+              <text variable="authority"/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <text macro="editor" suffix="."/>
+            <group delimiter=" " prefix=" " suffix=".">
+              <text variable="container-title" form="short" strip-periods="true" font-style="italic"/>
+              <group delimiter=":">
+                <group delimiter=";">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <text variable="volume"/>
+                </group>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/frontiers-of-biogeography.csl b/frontiers-of-biogeography.csl
index 876cf75fa0c..03f2743fc15 100644
--- a/frontiers-of-biogeography.csl
+++ b/frontiers-of-biogeography.csl
@@ -10,18 +10,21 @@
       <name>KSupriya</name>
       <email>supriyaknair@gmail.com</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="geography"/>
     <category field="biology"/>
     <eissn>1948-6596</eissn>
     <summary>Frontiers of Biogeography author-date style based on Harvard</summary>
-    <updated>2019-03-12T17:24:59+00:00</updated>
+    <updated>2022-04-07T08:33:56+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">
     <names variable="editor" delimiter=", ">
-      <name and="symbol" initialize-with="."/>
-      <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+      <label form="verb-short"/>
+      <name prefix=" " and="text" initialize-with="."/>
     </names>
   </macro>
   <macro name="anon">
@@ -58,9 +61,9 @@
     </choose>
   </macro>
   <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
+    <group delimiter=", ">
       <text variable="publisher"/>
+      <text variable="publisher-place"/>
     </group>
   </macro>
   <macro name="year-date">
@@ -88,7 +91,21 @@
       </else>
     </choose>
   </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <text variable="URL"/>
+      </if>
+      <else>
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else>
+    </choose>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <sort>
+      <key macro="year-date"/>
+      <key macro="author"/>
+    </sort>
     <layout delimiter=", " prefix="(" suffix=")">
       <group delimiter=", ">
         <group delimiter=" ">
@@ -108,75 +125,80 @@
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author"/>
-      <date variable="issued" prefix=" (" suffix=")">
-        <date-part name="year"/>
-      </date>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group prefix=" " delimiter=" " suffix=",">
-            <text macro="title"/>
-            <text macro="edition"/>
-            <text macro="editor"/>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
+      <group delimiter=". ">
+        <group delimiter=" ">
+          <text macro="author"/>
+          <date variable="issued" prefix="(" suffix=")">
+            <date-part name="year"/>
+          </date>
           <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" " delimiter=" ">
-            <text term="in" text-case="capitalize-first" suffix=":"/>
-            <text macro="editor"/>
-            <text variable="container-title" font-style="normal" suffix="."/>
-            <text variable="collection-title" suffix="."/>
-            <text variable="event" suffix="."/>
+        </group>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=" " suffix=",">
+              <text macro="edition"/>
+              <text macro="editor"/>
+            </group>
+            <text prefix=" " suffix="." macro="publisher"/>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=", " prefix=" ">
+              <group delimiter=" ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first" suffix=":"/>
+                  <text variable="container-title" font-style="normal" suffix="."/>
+                </group>
+                <text macro="editor" prefix="(" suffix=")"/>
+              </group>
+              <text variable="collection-title" suffix="."/>
+              <text variable="event" suffix="."/>
+              <group delimiter=" ">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper" match="any">
+            <group prefix=" " delimiter=", ">
+              <text variable="container-title" form="short" suffix=","/>
+              <text variable="collection-title"/>
+            </group>
+            <group prefix=" " suffix=":">
+              <date variable="issued">
+                <date-part name="day" suffix=" " range-delimiter="-"/>
+                <date-part name="month"/>
+              </date>
+            </group>
             <group suffix="." delimiter=" ">
               <text macro="publisher" prefix=" " suffix=","/>
-              <label variable="page" form="short" suffix=" "/>
+              <label variable="page" form="short"/>
               <text variable="page"/>
             </group>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper" match="any">
-          <text macro="title" prefix=" " suffix="."/>
-          <group prefix=" " delimiter=", ">
-            <text variable="container-title" form="short" suffix=","/>
-            <text variable="collection-title"/>
-          </group>
-          <group prefix=" " suffix=":">
-            <date variable="issued">
-              <date-part name="day" suffix=" " range-delimiter="-"/>
-              <date-part name="month"/>
-            </date>
-          </group>
-          <group suffix="." delimiter=" ">
-            <text macro="publisher" prefix=" " suffix=","/>
-            <label variable="page" form="short"/>
-            <text variable="page"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group prefix=" " suffix="." delimiter=". ">
-            <text macro="title"/>
-            <text variable="genre"/>
-            <text macro="publisher"/>
-          </group>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor" prefix=" "/>
-          </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title" font-style="normal"/>
-            <group prefix=" ">
-              <text variable="volume"/>
+          </else-if>
+          <else-if type="thesis">
+            <group prefix=" " suffix="." delimiter=". ">
+              <text variable="genre"/>
+              <text macro="publisher"/>
             </group>
-            <group prefix=", ">
-              <text variable="page"/>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="editor" prefix=" "/>
+              <group prefix=" " suffix=".">
+                <text variable="container-title" font-style="normal"/>
+                <group prefix=" ">
+                  <text variable="volume"/>
+                </group>
+                <group prefix=", ">
+                  <text variable="page"/>
+                </group>
+              </group>
             </group>
-          </group>
-        </else>
-      </choose>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>
diff --git a/frontiers.csl b/frontiers.csl
index 0978de4edbd..c00ab8c9c30 100644
--- a/frontiers.csl
+++ b/frontiers.csl
@@ -12,10 +12,13 @@
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
     </contributor>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style for the Open Access Frontiers in ... Journals</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2022-04-12T22:06:38+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">
@@ -47,7 +50,7 @@
   <macro name="access">
     <choose>
       <if variable="DOI">
-        <text variable="DOI" prefix="doi:"/>
+        <text variable="DOI" prefix="doi: "/>
       </if>
       <else-if variable="URL">
         <text value="Available at:" suffix=" "/>
diff --git a/harvard-university-of-the-west-of-england.csl b/harvard-university-of-the-west-of-england.csl
index 7eb02e21a91..e5bdfcb075c 100644
--- a/harvard-university-of-the-west-of-england.csl
+++ b/harvard-university-of-the-west-of-england.csl
@@ -11,8 +11,8 @@
       <name>Emma Delaney</name>
     </contributor>
     <category citation-format="author-date"/>
-    <summary>Harvard author-date style edited for University of the West of England (UWE)</summary>
-    <updated>2021-04-07T03:48:18+00:00</updated>
+    <summary>Harvard author-date style updated for University of the West of England (UWE) (et-al format updated to comply with UWE Harvard Referencing</summary>
+    <updated>2022-04-10T15:09:45+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">
@@ -22,18 +22,19 @@
     </names>
   </macro>
   <macro name="author">
-    <names variable="author">
-      <name and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
-      <label form="short" prefix=" "/>
+    <names variable="author" font-style="normal">
+      <name font-style="normal" and="text" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="10" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
+      <et-al font-style="italic"/>
+      <label form="short" font-style="normal" prefix=" "/>
       <substitute>
-        <text macro="substitute-author"/>
+        <text macro="substitute-author" font-style="normal"/>
       </substitute>
     </names>
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="text" delimiter-precedes-last="never"/>
-      <et-al font-style="normal"/>
+      <name form="short" and="text" delimiter-precedes-last="never" et-al-min="4"/>
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="translator"/>
         <text macro="substitute-author"/>
@@ -261,7 +262,7 @@
   </macro>
   <citation et-al-min="4" et-al-use-first="1" sort-separator="," disambiguate-add-year-suffix="true" collapse="year">
     <sort>
-      <key macro="author" names-use-last="true"/>
+      <key macro="year-date-citation" names-use-last="true" sort="descending"/>
     </sort>
     <layout suffix=")" delimiter="; " prefix="(">
       <group delimiter=", ">
@@ -274,13 +275,13 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1" hanging-indent="false">
+  <bibliography et-al-min="10" et-al-use-first="1">
     <sort>
       <key macro="author"/>
       <key variable="title"/>
     </sort>
     <layout>
-      <text macro="author"/>
+      <text macro="author" font-style="normal"/>
       <text macro="year-date-bibliography" prefix=" (" suffix=")"/>
       <choose>
         <if match="all" variable="author collection-title">
diff --git a/haute-ecole-de-gestion-de-geneve-iso-690.csl b/haute-ecole-de-gestion-de-geneve-iso-690.csl
index bb3208d81f0..4698051bdad 100644
--- a/haute-ecole-de-gestion-de-geneve-iso-690.csl
+++ b/haute-ecole-de-gestion-de-geneve-iso-690.csl
@@ -6,20 +6,37 @@
     <id>http://www.zotero.org/styles/haute-ecole-de-gestion-de-geneve-iso-690</id>
     <link href="http://www.zotero.org/styles/haute-ecole-de-gestion-de-geneve-iso-690" rel="self"/>
     <link href="http://www.zotero.org/styles/iso690-author-date-en" rel="template"/>
-    <link href="https://www.hesge.ch/heg/infotheque/citations-et-references-bibliographiques" rel="documentation"/>
+    <link href="https://www.hesge.ch/heg/campus/infotheque/citations-et-references-bibliographiques" rel="documentation"/>
     <author>
       <name>Melissa Paez</name>
       <email>paez.melissa@gmail.com</email>
     </author>
-    <contributor>
+    <author>
       <name>Raphael Grolimund</name>
       <email>grolimur@protonmail.ch</email>
-    </contributor>
+    </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2021-10-16T18:00:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+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-FR">
+    <terms>
+      <term name="no date">[sans date]</term>
+      <term name="in">in</term>
+      <term name="online">[en&#160;ligne]</term>
+      <term name="accessed">consulté&#160;le</term>
+      <term name="retrieved">disponible</term>
+      <term name="from">à l'adresse</term>
+      <term name="translator" form="short">trad.</term>
+      <term name="editor" form="short">éd.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="en-US">
+    <terms>
+      <term name="online">Online</term>
+    </terms>
+  </locale>
   <macro name="editor">
     <names variable="editor">
       <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
@@ -100,7 +117,7 @@
       <if type="book thesis map motion_picture song manuscript" match="any">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix="."/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -135,10 +152,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -168,7 +185,7 @@
       <else>
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -179,7 +196,7 @@
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -201,10 +218,6 @@
           </else>
         </choose>
       </if>
-      <else>
-        <text variable="genre"/>
-        <text variable="number" prefix=", "/>
-      </else>
     </choose>
   </macro>
   <macro name="date">
@@ -233,14 +246,14 @@
       <choose>
         <if variable="volume">
           <text variable="issue" prefix="no.&#160;"/>
-          <text variable="page" prefix="p.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </if>
         <else-if variable="issue">
           <text variable="issue" prefix="No.&#160;"/>
-          <text variable="page" prefix="p.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </else-if>
         <else>
-          <text variable="page" prefix="P.&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
         </else>
       </choose>
     </group>
@@ -271,7 +284,7 @@
         <text variable="number-of-pages" suffix="&#160;p"/>
       </if>
       <else-if type="chapter paper-conference article-newspaper" match="any">
-        <text variable="page" prefix="p.&#160;"/>
+        <text variable="page" prefix="pp.&#160;"/>
       </else-if>
       <else-if type="report patent" match="any">
         <text variable="page" suffix="&#160;p"/>
@@ -286,12 +299,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -339,6 +356,8 @@
               <text macro="title" suffix=". "/>
             </if>
           </choose>
+          <text variable="version" prefix="version " suffix=". "/>
+          <!-- used for software until type="software" is implemented -->
           <text macro="genre" suffix=". "/>
           <text macro="edition" suffix=". "/>
           <text macro="publisher-group" suffix=". "/>
@@ -418,6 +437,7 @@
           <text macro="accessed" suffix=". "/>
           <text macro="collection" suffix=". "/>
           <text macro="isbn" suffix=". "/>
+          <text macro="doi" suffix=". "/>
           <text macro="url"/>
         </else-if>
         <else-if type="thesis">
@@ -500,6 +520,19 @@
           <text macro="collection" suffix=". "/>
           <text macro="url"/>
         </else-if>
+        <else-if type="software">
+          <text macro="responsability" suffix=". "/>
+          <choose>
+            <if variable="author editor translator" match="any">
+              <text macro="title" suffix=". "/>
+            </if>
+          </choose>
+          <text variable="version" prefix="version " suffix=". "/>
+          <text macro="date" suffix=". "/>
+          <text macro="publisher-group" suffix=". "/>
+          <text macro="accessed" suffix=". "/>
+          <text macro="url"/>
+        </else-if>
         <else>
           <text macro="responsability" suffix=". "/>
           <choose>
@@ -520,6 +553,7 @@
           <text macro="url"/>
         </else>
       </choose>
+      <text variable="note"/>
       <group display="right-inline">
         <text macro="archive"/>
       </group>
diff --git a/institut-francais-darcheologie-orientale-arab-studies.csl b/institut-francais-darcheologie-orientale-arab-studies.csl
index 05065bbb727..7504bbe9a12 100644
--- a/institut-francais-darcheologie-orientale-arab-studies.csl
+++ b/institut-francais-darcheologie-orientale-arab-studies.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Institut français d'archéologie orientale - Arab Studies (English)</title>
@@ -8,7 +8,7 @@
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale-arab-studies" rel="self"/>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="template"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2021_angl.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2022_angl.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -16,7 +16,7 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Style sheet for the arabic studies publications of the Institut français d'archéologie orientale</summary>
-    <updated>2021-07-11T17:51:15+00:00</updated>
+    <updated>2022-03-15T16:11:06+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">
@@ -50,15 +50,13 @@
   <macro name="container-title">
     <text variable="container-title" form="short" font-style="italic"/>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title" form="short"/>
-  </macro>
   <macro name="author">
     <names variable="author">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="family"/>
         <name-part name="given"/>
       </name>
+      <et-al font-style="normal"/>
     </names>
   </macro>
   <macro name="author-short">
@@ -71,10 +69,11 @@
   </macro>
   <macro name="editor">
     <names variable="editor" font-variant="normal" text-decoration="none">
-      <name font-variant="normal" and="symbol" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+      <name font-variant="normal" delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="family" font-variant="normal"/>
         <name-part name="given"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <text macro="container-author"/>
@@ -83,10 +82,11 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -109,9 +109,6 @@
   <macro name="archive-location">
     <text variable="archive_location"/>
   </macro>
-  <macro name="collection-number">
-    <number variable="collection-number"/>
-  </macro>
   <macro name="volume">
     <choose>
       <if match="any" is-numeric="volume">
@@ -135,16 +132,14 @@
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date form="text" variable="accessed"/>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="&#8211;"/>
+          <date-part name="month" range-delimiter="&#8211;"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" text-case="lowercase" prefix="[" suffix="]"/>
@@ -154,7 +149,9 @@
   <macro name="issued-year">
     <choose>
       <if match="any" variable="issued">
-        <date date-parts="year" form="text" variable="issued"/>
+        <date delimiter="" variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" prefix="[" suffix="]"/>
@@ -162,16 +159,12 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date date-parts="year" form="text" variable="original-date">
+      <date-part name="year" range-delimiter="&#8211;"/>
+    </date>
   </macro>
   <macro name="URL">
-    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-  </macro>
-  <macro name="edition">
-    <group delimiter="&#160;">
-      <number variable="edition" form="ordinal"/>
-      <label variable="edition" form="short"/>
-    </group>
+    <text variable="URL"/>
   </macro>
   <macro name="sort">
     <choose>
@@ -212,69 +205,48 @@
   </macro>
   <macro name="event-date">
     <date delimiter="" variable="event-date">
-      <date-part name="day" suffix=" "/>
-      <date-part name="month" prefix=" " suffix=" "/>
-      <date-part name="year" range-delimiter="-" prefix=" "/>
+      <date-part name="day" range-delimiter="&#8211;" suffix=" "/>
+      <date-part name="month" range-delimiter="&#8211;" prefix=" " suffix=" "/>
+      <date-part name="year" range-delimiter="&#8211;" prefix=" "/>
     </date>
   </macro>
   <macro name="citation">
     <choose>
       <if match="any" variable="author editor">
-        <group delimiter=",&#160;">
-          <choose>
-            <if match="any" variable="author">
-              <text macro="author-short"/>
-            </if>
-            <else>
-              <text macro="editor-short"/>
-            </else>
-          </choose>
-          <choose>
-            <if type="entry-dictionary" match="any">
-              <text macro="title"/>
-            </if>
-          </choose>
-          <group>
+        <group delimiter="&#160;">
+          <group delimiter=", ">
+            <choose>
+              <if match="any" variable="author">
+                <text macro="author-short"/>
+              </if>
+              <else>
+                <text macro="editor-short"/>
+              </else>
+            </choose>
             <choose>
               <if type="entry-dictionary entry-encyclopedia" match="any">
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year"/>
-                  </else>
-                </choose>
+                <text macro="title"/>
+                <group suffix=",">
+                  <text macro="container-title"/>
+                  <number vertical-align="sup" variable="edition"/>
+                </group>
+              </if>
+            </choose>
+          </group>
+          <group>
+            <choose>
+              <if match="any" variable="status">
+                <text macro="status"/>
               </if>
               <else>
-                <choose>
-                  <if match="any" variable="original-date">
-                    <group delimiter="&#160;">
-                      <text macro="original-date"/>
-                      <group delimiter="&#160;" prefix="(" suffix=")">
-                        <text term="edition" form="short"/>
-                        <text macro="issued-year"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else-if match="any" variable="status">
-                    <group>
-                      <text macro="status"/>
-                    </group>
-                  </else-if>
-                  <else>
-                    <group>
-                      <text macro="issued-year"/>
-                    </group>
-                  </else>
-                </choose>
+                <text macro="issued-year"/>
               </else>
             </choose>
             <text macro="year-suffix"/>
           </group>
         </group>
       </if>
-      <else-if type="entry-dictionary entry-encyclopedia" match="any">
+      <else-if type="entry-encyclopedia entry-dictionary" match="any">
         <group delimiter=",&#160;">
           <text macro="container-title"/>
           <text macro="title"/>
@@ -294,7 +266,10 @@
       <else>
         <choose>
           <if type="webpage" match="any">
-            <text macro="container-title"/>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="issued-year"/>
+            </group>
           </if>
           <else>
             <group delimiter=", ">
@@ -307,24 +282,11 @@
                 </else>
               </choose>
               <choose>
-                <if match="any" variable="original-date">
-                  <group delimiter=" ">
-                    <text macro="original-date"/>
-                    <group delimiter=" " prefix="(" suffix=")">
-                      <text term="edition"/>
-                      <text macro="issued-year"/>
-                    </group>
-                  </group>
+                <if match="any" variable="status">
+                  <text macro="status"/>
                 </if>
-                <else-if match="any" variable="status">
-                  <group>
-                    <text macro="status"/>
-                  </group>
-                </else-if>
                 <else>
-                  <group>
-                    <text macro="issued-year"/>
-                  </group>
+                  <text macro="issued-year"/>
                 </else>
               </choose>
               <text macro="year-suffix"/>
@@ -336,10 +298,11 @@
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false" initialize-with="">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -348,32 +311,33 @@
   <macro name="note">
     <text variable="note"/>
   </macro>
-  <macro name="editor-name-first">
-    <names variable="editor">
-      <name and="symbol" delimiter-precedes-last="never" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <text macro="container-author-name-first"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="container-author-name-first">
-    <names variable="container-author">
-      <name and="symbol" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-    </names>
-  </macro>
   <macro name="number-of-volumes">
     <group delimiter=" ">
       <number variable="number-of-volumes"/>
-      <text term="volume" form="short"/>
+      <text term="volume" form="short" plural="true"/>
+    </group>
+  </macro>
+  <macro name="first-edition">
+    <group delimiter=" " prefix=" (" suffix=")">
+      <text value="1st"/>
+      <text term="edition" form="short"/>
+      <text macro="original-date"/>
     </group>
   </macro>
+  <macro name="issued-year-month-day-short">
+    <choose>
+      <if match="any" variable="issued">
+        <date delimiter=" " variable="issued">
+          <date-part name="day"/>
+          <date-part name="month" form="short"/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
   <citation name-delimiter=", " initialize="false" near-note-distance="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="all-names" collapse="citation-number">
     <sort>
       <key macro="sort"/>
@@ -383,7 +347,7 @@
       <text macro="locator" prefix=", "/>
     </layout>
   </citation>
-  <bibliography initialize="false" subsequent-author-substitute="&#8212;">
+  <bibliography initialize-with=".">
     <sort>
       <key macro="sort"/>
       <key variable="issued"/>
@@ -404,7 +368,6 @@
               <group delimiter="&#160;">
                 <text macro="title" font-style="normal"/>
                 <text macro="volume"/>
-                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <text macro="translator"/>
               <choose>
@@ -417,35 +380,29 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
-              <group>
-                <choose>
-                  <if match="none" variable="publisher-place issued">
-                    <text value="n.p., n.d." prefix="[" suffix="]"/>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="publisher"/>
-                      <text macro="publisher-place"/>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition" prefix="(" suffix=")"/>
-                          </group>
-                        </else>
-                      </choose>
-                    </group>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="none" variable="publisher-place issued">
+                  <text value="n.p., n.d." prefix="[" suffix="]"/>
+                </if>
+                <else>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
+                  </group>
+                </else>
+              </choose>
             </group>
           </if>
           <else-if type="article-journal article-magazine article-newspaper article" match="any">
@@ -459,17 +416,14 @@
                   <number variable="issue"/>
                 </group>
               </group>
-              <group>
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year-month-day"/>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="any" variable="status">
+                  <text macro="status"/>
+                </if>
+                <else>
+                  <text macro="issued-year-month-day"/>
+                </else>
+              </choose>
               <text macro="pages"/>
             </group>
           </else-if>
@@ -479,10 +433,9 @@
               <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
                 <text term="in" font-style="normal"/>
-                <text macro="editor-name-first" suffix=","/>
+                <text macro="editor" suffix=","/>
                 <text macro="container-title"/>
                 <text macro="volume"/>
-                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <choose>
                 <if match="any" variable="genre">
@@ -494,32 +447,26 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
               <choose>
                 <if match="none" variable="publisher-place issued">
                   <text value="n.p., n.d." prefix="[" suffix="]"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                    <group>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition"/>
-                          </group>
-                        </else>
-                      </choose>
-                      <text macro="year-suffix"/>
-                    </group>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
                   </group>
                 </else>
               </choose>
@@ -539,7 +486,6 @@
           <else-if type="entry-dictionary" match="any">
             <group delimiter=", ">
               <text macro="author"/>
-              <text macro="title"/>
               <text macro="container-title"/>
               <text macro="number-of-volumes"/>
               <choose>
@@ -548,7 +494,6 @@
                 </if>
                 <else>
                   <group delimiter=", ">
-                    <text macro="publisher"/>
                     <text macro="publisher-place"/>
                     <choose>
                       <if match="any" variable="status">
@@ -561,37 +506,19 @@
                   </group>
                 </else>
               </choose>
-              <text macro="volume"/>
-              <text macro="pages"/>
             </group>
           </else-if>
           <else-if type="entry-encyclopedia" match="any">
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="title"/>
-              <text macro="container-title"/>
-              <text macro="edition" vertical-align="baseline"/>
               <text macro="volume"/>
               <choose>
-                <if match="none" variable="publisher-place issued">
-                  <text value="n.p., n.d." prefix="[" suffix="]"/>
+                <if match="any" variable="status">
+                  <text macro="status"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                  </group>
-                  <group>
-                    <choose>
-                      <if match="any" variable="status">
-                        <text macro="status"/>
-                      </if>
-                      <else>
-                        <text macro="issued-year"/>
-                      </else>
-                    </choose>
-                    <text macro="year-suffix"/>
-                  </group>
+                  <text macro="issued-year"/>
                 </else>
               </choose>
               <text macro="pages"/>
@@ -620,26 +547,23 @@
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="container-title"/>
-              <group delimiter="&#160;">
-                <text macro="genre"/>
-              </group>
+              <text macro="genre"/>
               <text macro="URL"/>
               <choose>
                 <if match="any" variable="issued">
                   <group delimiter="&#160;">
                     <text value="version"/>
-                    <text macro="issued-year-month-day"/>
+                    <text macro="issued-year-month-day-short"/>
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
                 <text term="in" font-style="normal"/>
                 <text macro="container-title"/>
               </group>
@@ -649,10 +573,9 @@
               </group>
               <text macro="URL"/>
               <group delimiter="&#160;">
-                <text value="publié le"/>
-                <text macro="issued-year-month-day"/>
+                <text value="published on"/>
+                <text macro="issued-year-month-day-short"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -661,7 +584,6 @@
             <choose>
               <if type="webpage post-weblog" match="none">
                 <text macro="URL"/>
-                <text macro="accessed"/>
               </if>
             </choose>
           </if>
diff --git a/institut-francais-darcheologie-orientale-en.csl b/institut-francais-darcheologie-orientale-en.csl
index 72d3cf84be9..30f23994569 100644
--- a/institut-francais-darcheologie-orientale-en.csl
+++ b/institut-francais-darcheologie-orientale-en.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with="." page-range-format="expanded" demote-non-dropping-particle="sort-only">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Institut français d'archéologie orientale - Egyptology (English)</title>
@@ -8,7 +8,7 @@
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale-en" rel="self"/>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="template"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2021_angl.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2022_angl.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -16,7 +16,7 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Style sheet for the archeological and egyptological publications of the Institut français d'archéologie orientale</summary>
-    <updated>2021-07-11T09:27:26+00:00</updated>
+    <updated>2022-03-15T14:37:59+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">
@@ -50,10 +50,11 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name delimiter=", " initialize-with="." name-as-sort-order="all">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al/>
     </names>
   </macro>
   <macro name="author-short">
@@ -66,19 +67,24 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name delimiter=", " initialize-with="." name-as-sort-order="all">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <text macro="container-author"/>
+      </substitute>
     </names>
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="small-caps"/>
         <name-part name="family" font-variant="small-caps"/>
       </name>
+      <et-al/>
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -121,29 +127,19 @@
     <group delimiter="&#160;">
       <choose>
         <if match="any" is-numeric="page">
-          <label variable="page" form="short"/>
+          <text term="page" form="short" plural="true"/>
         </if>
       </choose>
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date delimiter="&#160;" variable="accessed">
-        <date-part name="day"/>
-        <date-part name="month" form="short"/>
-        <date-part name="year"/>
-      </date>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
         <date delimiter="&#160;" variable="issued">
-          <date-part name="day"/>
-          <date-part name="month" form="short"/>
-          <date-part name="year"/>
+          <date-part name="day" range-delimiter="&#8211;"/>
+          <date-part name="month" range-delimiter="&#8211;"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
         </date>
       </if>
       <else>
@@ -155,7 +151,7 @@
     <choose>
       <if match="any" variable="issued">
         <date date-parts="year" form="text" variable="issued">
-          <date-part name="year"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
         </date>
       </if>
       <else>
@@ -164,10 +160,12 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date delimiter="" variable="original-date">
+      <date-part name="year" range-delimiter="&#8211;"/>
+    </date>
   </macro>
   <macro name="URL">
-    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+    <text variable="URL"/>
   </macro>
   <macro name="edition">
     <group delimiter="&#160;" prefix="(" suffix=")">
@@ -206,18 +204,6 @@
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
-  <macro name="editor-name-first">
-    <names variable="editor">
-      <name initialize-with=".">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <text macro="container-author"/>
-      </substitute>
-    </names>
-  </macro>
   <macro name="citation">
     <choose>
       <if match="any" variable="title-short">
@@ -302,18 +288,19 @@
     <text variable="event-place"/>
   </macro>
   <macro name="event-date">
-    <date delimiter="" variable="event-date">
-      <date-part name="day"/>
-      <date-part name="month" form="short" prefix=" "/>
-      <date-part name="year" range-delimiter="-" prefix=" "/>
+    <date delimiter=" " variable="event-date">
+      <date-part name="day" range-delimiter="&#8211;"/>
+      <date-part name="month" form="short" range-delimiter="&#8211;"/>
+      <date-part name="year" range-delimiter="&#8211;"/>
     </date>
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -322,6 +309,17 @@
   <macro name="note">
     <text variable="note"/>
   </macro>
+  <macro name="issued-year-month-day-short">
+    <choose>
+      <if match="any" variable="issued">
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="&#8211;"/>
+          <date-part name="month" form="short" range-delimiter="&#8211;"/>
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
   <citation name-delimiter=", " disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="all-names">
     <sort>
       <key macro="sort"/>
@@ -340,7 +338,7 @@
       <group display="block">
         <text macro="citation"/>
       </group>
-      <group display="left-margin" delimiter="&#160;" suffix=".">
+      <group display="left-margin" delimiter=", " suffix=".">
         <choose>
           <if type="book" match="any">
             <group delimiter=", ">
@@ -423,7 +421,7 @@
               <text macro="title"/>
               <group delimiter="&#160;">
                 <text term="in" font-style="normal"/>
-                <text macro="editor-name-first" suffix=","/>
+                <text macro="editor" suffix=","/>
                 <text macro="container-title"/>
                 <text macro="volume"/>
                 <text macro="original-date" prefix="(" suffix=")"/>
@@ -527,11 +525,10 @@
                 <if match="any" variable="issued">
                   <group delimiter="&#160;">
                     <text value="version"/>
-                    <text macro="issued-year-month-day"/>
+                    <text macro="issued-year-month-day-short"/>
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
@@ -549,9 +546,8 @@
               <text macro="URL"/>
               <group delimiter="&#160;">
                 <text value="published"/>
-                <text macro="issued-year-month-day"/>
+                <text macro="issued-year-month-day-short"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -561,7 +557,6 @@
               <if type="webpage post-weblog" match="none">
                 <group delimiter=", ">
                   <text macro="URL"/>
-                  <text macro="accessed"/>
                 </group>
               </if>
             </choose>
diff --git a/institut-francais-darcheologie-orientale-etudes-arabes.csl b/institut-francais-darcheologie-orientale-etudes-arabes.csl
index 6bed9224445..9cd5dc18390 100644
--- a/institut-francais-darcheologie-orientale-etudes-arabes.csl
+++ b/institut-francais-darcheologie-orientale-etudes-arabes.csl
@@ -8,7 +8,7 @@
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale-etudes-arabes" rel="self"/>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="template"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2021_fr.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_arabisantes_2022_fr.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -16,13 +16,14 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Feuille de style pour les publications dans le domaine des études arabes de l'Institut français d'archéologie orientale</summary>
-    <updated>2021-07-11T17:53:47+00:00</updated>
+    <updated>2022-03-07T16:08:31+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">
     <terms>
       <term name="no date" form="short">s.d.</term>
       <term name="sub-verbo" form="short">s.v.</term>
+      <term name="in">dans</term>
     </terms>
   </locale>
   <macro name="title">
@@ -41,15 +42,13 @@
   <macro name="container-title">
     <text variable="container-title" form="short" font-style="italic"/>
   </macro>
-  <macro name="collection-title">
-    <text variable="collection-title" form="short"/>
-  </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
-        <name-part name="family"/>
+      <name delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
+        <name-part name="family"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="author-short">
@@ -62,10 +61,11 @@
   </macro>
   <macro name="editor">
     <names variable="editor" font-variant="normal" text-decoration="none">
-      <name font-variant="normal" and="text" delimiter-precedes-last="never" initialize="false" name-as-sort-order="all">
+      <name font-variant="normal" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="family" font-variant="normal"/>
         <name-part name="given"/>
       </name>
+      <et-al/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
       <substitute>
         <text macro="container-author"/>
@@ -74,10 +74,11 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="text" delimiter-precedes-last="never" initialize="false">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="small-caps"/>
         <name-part name="family" font-variant="small-caps"/>
       </name>
+      <et-al font-style="italic"/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -100,9 +101,6 @@
   <macro name="archive-location">
     <text variable="archive_location"/>
   </macro>
-  <macro name="collection-number">
-    <number variable="collection-number"/>
-  </macro>
   <macro name="volume">
     <choose>
       <if match="any" is-numeric="volume">
@@ -126,16 +124,14 @@
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date form="text" variable="accessed"/>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="-"/>
+          <date-part name="month" range-delimiter="-"/>
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" text-case="lowercase" prefix="[" suffix="]"/>
@@ -145,7 +141,9 @@
   <macro name="issued-year">
     <choose>
       <if match="any" variable="issued">
-        <date date-parts="year" form="text" variable="issued"/>
+        <date delimiter="" variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" prefix="[" suffix="]"/>
@@ -153,15 +151,21 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date delimiter="" variable="original-date">
+      <date-part name="year" range-delimiter="-"/>
+    </date>
   </macro>
   <macro name="URL">
     <text variable="URL"/>
   </macro>
-  <macro name="edition">
-    <group delimiter="&#160;" prefix="(" suffix=")">
-      <number variable="edition" form="ordinal"/>
+  <macro name="first-edition">
+    <group delimiter="&#160;" prefix=" (" suffix=")">
+      <group>
+        <text value="1"/>
+        <text value="re" vertical-align="sup"/>
+      </group>
       <label variable="edition" form="short"/>
+      <text macro="original-date"/>
     </group>
   </macro>
   <macro name="sort">
@@ -203,62 +207,41 @@
   </macro>
   <macro name="event-date">
     <date delimiter="" variable="event-date">
-      <date-part name="day"/>
-      <date-part name="month" prefix=" "/>
+      <date-part name="day" range-delimiter="-"/>
+      <date-part name="month" range-delimiter="-" prefix=" "/>
       <date-part name="year" range-delimiter="-" prefix=" "/>
     </date>
   </macro>
   <macro name="citation">
     <choose>
       <if match="any" variable="author editor">
-        <group delimiter=",&#160;">
-          <choose>
-            <if match="any" variable="author">
-              <text macro="author-short"/>
-            </if>
-            <else>
-              <text macro="editor-short"/>
-            </else>
-          </choose>
-          <choose>
-            <if type="entry-dictionary entry-encyclopedia" match="any">
-              <text macro="title"/>
-            </if>
-          </choose>
-          <group>
+        <group delimiter="&#160;">
+          <group delimiter=", ">
+            <choose>
+              <if match="any" variable="author">
+                <text macro="author-short"/>
+              </if>
+              <else>
+                <text macro="editor-short"/>
+              </else>
+            </choose>
             <choose>
               <if type="entry-dictionary entry-encyclopedia" match="any">
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year"/>
-                  </else>
-                </choose>
+                <text macro="title"/>
+                <group suffix=",">
+                  <text macro="container-title"/>
+                  <number vertical-align="sup" variable="edition"/>
+                </group>
+              </if>
+            </choose>
+          </group>
+          <group>
+            <choose>
+              <if match="any" variable="status">
+                <text macro="status"/>
               </if>
               <else>
-                <choose>
-                  <if match="any" variable="original-date">
-                    <group delimiter="&#160;">
-                      <text macro="original-date"/>
-                      <group delimiter="&#160;" prefix="(" suffix=")">
-                        <text term="edition" form="short"/>
-                        <text macro="issued-year"/>
-                      </group>
-                    </group>
-                  </if>
-                  <else-if match="any" variable="status">
-                    <group>
-                      <text macro="status"/>
-                    </group>
-                  </else-if>
-                  <else>
-                    <group>
-                      <text macro="issued-year"/>
-                    </group>
-                  </else>
-                </choose>
+                <text macro="issued-year"/>
               </else>
             </choose>
             <text macro="year-suffix"/>
@@ -269,22 +252,46 @@
         <group delimiter=",&#160;">
           <text macro="container-title"/>
           <text macro="title"/>
+          <group>
+            <choose>
+              <if match="any" variable="status">
+                <text macro="status"/>
+              </if>
+              <else>
+                <text macro="issued-year"/>
+              </else>
+            </choose>
+            <text macro="year-suffix"/>
+          </group>
         </group>
       </else-if>
       <else>
         <choose>
           <if type="webpage" match="any">
-            <text macro="container-title"/>
+            <group delimiter=", ">
+              <text macro="container-title"/>
+              <text macro="issued-year"/>
+            </group>
           </if>
           <else>
-            <choose>
-              <if match="any" variable="title-short">
-                <text macro="title-short"/>
-              </if>
-              <else>
-                <text macro="title"/>
-              </else>
-            </choose>
+            <group delimiter=", ">
+              <choose>
+                <if match="any" variable="title-short">
+                  <text macro="title-short"/>
+                </if>
+                <else>
+                  <text macro="title"/>
+                </else>
+              </choose>
+              <choose>
+                <if match="any" variable="status">
+                  <text macro="status"/>
+                </if>
+                <else>
+                  <text macro="issued-year"/>
+                </else>
+              </choose>
+            </group>
           </else>
         </choose>
       </else>
@@ -292,10 +299,11 @@
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="">
+      <name delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -304,25 +312,11 @@
   <macro name="note">
     <text variable="note"/>
   </macro>
-  <macro name="editor-name-first">
-    <names variable="editor">
-      <name and="text" delimiter-precedes-last="never" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <text macro="container-author-name-first"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="container-author-name-first">
-    <names variable="container-author">
-      <name and="text" initialize="false">
-        <name-part name="given"/>
-        <name-part name="family"/>
-      </name>
-    </names>
+  <macro name="number-of-volumes">
+    <group delimiter=" ">
+      <number variable="number-of-volumes"/>
+      <text term="volume" form="short"/>
+    </group>
   </macro>
   <citation name-delimiter=", " initialize="false" near-note-distance="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="all-names" collapse="citation-number">
     <sort>
@@ -333,7 +327,7 @@
       <text macro="locator" prefix=", "/>
     </layout>
   </citation>
-  <bibliography initialize="false" subsequent-author-substitute="&#8212;">
+  <bibliography initialize-with=".">
     <sort>
       <key macro="sort"/>
       <key variable="issued"/>
@@ -354,7 +348,6 @@
               <group delimiter="&#160;">
                 <text macro="title" font-style="normal"/>
                 <text macro="volume"/>
-                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <text macro="translator"/>
               <choose>
@@ -367,35 +360,29 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
-              <group>
-                <choose>
-                  <if match="none" variable="publisher-place issued">
-                    <text value="s.l.n.d." prefix="[" suffix="]"/>
-                  </if>
-                  <else>
-                    <group delimiter=", ">
-                      <text macro="publisher"/>
-                      <text macro="publisher-place"/>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition"/>
-                          </group>
-                        </else>
-                      </choose>
-                    </group>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="none" variable="publisher-place issued">
+                  <text value="s.l.n.d." prefix="[" suffix="]"/>
+                </if>
+                <else>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
+                  </group>
+                </else>
+              </choose>
             </group>
           </if>
           <else-if type="article-journal article-magazine article-newspaper article" match="any">
@@ -409,44 +396,26 @@
                   <number variable="issue"/>
                 </group>
               </group>
-              <group>
-                <choose>
-                  <if match="any" variable="status">
-                    <text macro="status"/>
-                  </if>
-                  <else>
-                    <text macro="issued-year-month-day"/>
-                  </else>
-                </choose>
-                <text macro="year-suffix"/>
-              </group>
+              <choose>
+                <if match="any" variable="status">
+                  <text macro="status"/>
+                </if>
+                <else>
+                  <text macro="issued-year-month-day"/>
+                </else>
+              </choose>
               <text macro="pages"/>
             </group>
           </else-if>
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
-                <choose>
-                  <if match="any" variable="editor container-author">
-                    <group delimiter="&#160;">
-                      <text term="in" font-style="italic"/>
-                      <text macro="editor-name-first" suffix=","/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter="&#160;">
-                      <text term="in"/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </else>
-                </choose>
+                <text term="in" font-style="normal"/>
+                <text macro="editor" suffix=","/>
+                <text macro="container-title"/>
+                <text macro="volume"/>
               </group>
               <choose>
                 <if match="any" variable="genre">
@@ -458,32 +427,26 @@
                 </if>
               </choose>
               <text macro="note"/>
-              <group delimiter="&#160;">
-                <text macro="collection-title"/>
-                <text macro="collection-number"/>
-              </group>
               <choose>
                 <if match="none" variable="publisher-place issued">
                   <text value="s.l.n.d." prefix="[" suffix="]"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                    <group>
-                      <choose>
-                        <if match="any" variable="status">
-                          <text macro="status"/>
-                        </if>
-                        <else>
-                          <group delimiter="&#160;">
-                            <text macro="issued-year"/>
-                            <text macro="edition"/>
-                          </group>
-                        </else>
-                      </choose>
-                      <text macro="year-suffix"/>
-                    </group>
+                  <text macro="publisher-place"/>
+                  <group delimiter=" ">
+                    <choose>
+                      <if match="any" variable="status">
+                        <text macro="status"/>
+                      </if>
+                      <else>
+                        <text macro="issued-year"/>
+                      </else>
+                    </choose>
+                    <choose>
+                      <if match="any" variable="edition">
+                        <text macro="first-edition"/>
+                      </if>
+                    </choose>
                   </group>
                 </else>
               </choose>
@@ -502,35 +465,40 @@
               <text macro="archive-location"/>
             </group>
           </else-if>
-          <else-if type="entry-dictionary entry-encyclopedia" match="any">
+          <else-if type="entry-dictionary" match="any">
+            <group delimiter=", ">
+              <text macro="author"/>
+              <text macro="container-title"/>
+              <text macro="number-of-volumes"/>
+              <choose>
+                <if match="none" variable="publisher-place issued">
+                  <text value="s.l.n.d."/>
+                </if>
+                <else>
+                  <text macro="publisher-place"/>
+                  <choose>
+                    <if match="any" variable="status">
+                      <text macro="status"/>
+                    </if>
+                    <else>
+                      <text macro="issued-year"/>
+                    </else>
+                  </choose>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="entry-encyclopedia" match="any">
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="title"/>
-              <group>
-                <text macro="container-title"/>
-                <text variable="edition" vertical-align="sup"/>
-              </group>
               <text macro="volume"/>
               <choose>
-                <if match="none" variable="publisher-place issued">
-                  <text value="s.l.n.d." prefix="[" suffix="]"/>
+                <if match="any" variable="status">
+                  <text macro="status"/>
                 </if>
                 <else>
-                  <group delimiter=", ">
-                    <text macro="publisher"/>
-                    <text macro="publisher-place"/>
-                  </group>
-                  <group>
-                    <choose>
-                      <if match="any" variable="status">
-                        <text macro="status"/>
-                      </if>
-                      <else>
-                        <text macro="issued-year"/>
-                      </else>
-                    </choose>
-                    <text macro="year-suffix"/>
-                  </group>
+                  <text macro="issued-year"/>
                 </else>
               </choose>
               <text macro="pages"/>
@@ -559,9 +527,7 @@
             <group delimiter=", ">
               <text macro="author"/>
               <text macro="container-title"/>
-              <group delimiter="&#160;">
-                <text macro="genre"/>
-              </group>
+              <text macro="genre"/>
               <text macro="URL"/>
               <choose>
                 <if match="any" variable="issued">
@@ -571,14 +537,13 @@
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
                 <text term="in" font-style="normal"/>
                 <text macro="container-title"/>
               </group>
@@ -591,7 +556,6 @@
                 <text value="publié le"/>
                 <text macro="issued-year-month-day"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -600,7 +564,6 @@
             <choose>
               <if type="webpage post-weblog" match="none">
                 <text macro="URL"/>
-                <text macro="accessed"/>
               </if>
             </choose>
           </if>
diff --git a/institut-francais-darcheologie-orientale.csl b/institut-francais-darcheologie-orientale.csl
index 416e32d96dc..6edfa836f74 100644
--- a/institut-francais-darcheologie-orientale.csl
+++ b/institut-francais-darcheologie-orientale.csl
@@ -7,7 +7,7 @@
     <id>http://www.zotero.org/styles/institut-francais-darcheologie-orientale</id>
     <link href="http://www.zotero.org/styles/institut-francais-darcheologie-orientale" rel="self"/>
     <link href="https://www.ifao.egnet.net/publications/publier/normes-ed/" rel="documentation"/>
-    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2021_fr.pdf" rel="documentation"/>
+    <link href="https://www.ifao.egnet.net/uploads/publications/normes/IFAO_publications_normes_bibliographiques_pub_egypto_2022_fr.pdf" rel="documentation"/>
     <author>
       <name>Nicolas Souchon</name>
       <email>souchon.nicolas.ns@gmail.com</email>
@@ -15,13 +15,14 @@
     <category citation-format="note"/>
     <category field="history"/>
     <summary>Feuille de style pour les publications d'archéologie et d'égyptologie de l'Institut français d'archéologie orientale</summary>
-    <updated>2021-07-07T20:27:34+00:00</updated>
+    <updated>2022-03-07T15:45:14+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">
     <terms>
       <term name="no date" form="short">s.d.</term>
       <term name="sub-verbo" form="short">s.v.</term>
+      <term name="in">dans</term>
     </terms>
   </locale>
   <macro name="title">
@@ -45,10 +46,11 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="author-short">
@@ -61,10 +63,11 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given"/>
         <name-part name="family"/>
       </name>
+      <et-al font-style="italic"/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
       <substitute>
         <text macro="container-author"/>
@@ -73,10 +76,11 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name delimiter=", " initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="small-caps"/>
         <name-part name="family" font-variant="small-caps"/>
       </name>
+      <et-al font-style="italic"/>
       <label form="short" plural="never" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -125,16 +129,14 @@
       <text variable="page"/>
     </group>
   </macro>
-  <macro name="accessed">
-    <group delimiter="&#160;">
-      <text term="accessed" text-case="lowercase"/>
-      <date form="text" variable="accessed"/>
-    </group>
-  </macro>
   <macro name="issued-year-month-day">
     <choose>
       <if match="any" variable="issued">
-        <date form="text" date-parts="year-month-day" variable="issued"/>
+        <date delimiter=" " variable="issued">
+          <date-part name="day" range-delimiter="-"/>
+          <date-part name="month" range-delimiter="-"/>
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" text-case="lowercase" prefix="[" suffix="]"/>
@@ -144,7 +146,9 @@
   <macro name="issued-year">
     <choose>
       <if match="any" variable="issued">
-        <date date-parts="year" form="text" variable="issued"/>
+        <date delimiter="" variable="issued">
+          <date-part name="year" range-delimiter="-"/>
+        </date>
       </if>
       <else>
         <text term="no date" form="short" prefix="[" suffix="]"/>
@@ -152,7 +156,9 @@
     </choose>
   </macro>
   <macro name="original-date">
-    <date date-parts="year" form="text" variable="original-date"/>
+    <date delimiter="" variable="original-date">
+      <date-part name="year" range-delimiter="-"/>
+    </date>
   </macro>
   <macro name="URL">
     <text variable="URL"/>
@@ -202,8 +208,8 @@
   </macro>
   <macro name="event-date">
     <date delimiter="" variable="event-date">
-      <date-part name="day"/>
-      <date-part name="month" prefix=" "/>
+      <date-part name="day" range-delimiter="-"/>
+      <date-part name="month" range-delimiter="-" prefix=" "/>
       <date-part name="year" range-delimiter="-" prefix=" "/>
     </date>
   </macro>
@@ -286,10 +292,11 @@
   </macro>
   <macro name="container-author">
     <names variable="container-author">
-      <name initialize-with=".">
+      <name delimiter-precedes-et-al="never" delimiter-precedes-last="never" et-al-min="5" et-al-use-first="1" initialize-with=".">
         <name-part name="given" font-variant="normal"/>
         <name-part name="family" font-variant="normal"/>
       </name>
+      <et-al font-style="italic"/>
     </names>
   </macro>
   <macro name="year-suffix">
@@ -396,27 +403,13 @@
           <else-if type="chapter paper-conference" match="any">
             <group delimiter=", ">
               <text macro="author"/>
+              <text macro="title" quotes="false"/>
               <group delimiter="&#160;">
-                <text macro="title" quotes="false"/>
-                <choose>
-                  <if match="any" variable="editor container-author">
-                    <group delimiter="&#160;">
-                      <text term="in" font-style="italic"/>
-                      <text macro="editor" suffix=","/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </if>
-                  <else>
-                    <group delimiter="&#160;">
-                      <text term="in"/>
-                      <text macro="container-title"/>
-                      <text macro="volume"/>
-                      <text macro="original-date" prefix="(" suffix=")"/>
-                    </group>
-                  </else>
-                </choose>
+                <text term="in" font-style="normal"/>
+                <text macro="editor" suffix=","/>
+                <text macro="container-title"/>
+                <text macro="volume"/>
+                <text macro="original-date" prefix="(" suffix=")"/>
               </group>
               <choose>
                 <if match="any" variable="genre">
@@ -485,7 +478,7 @@
                 </else>
               </choose>
               <text macro="pages"/>
-              <group delimiter="&#160;">
+              <group display="block" delimiter="&#160;">
                 <text term="sub-verbo" form="short" font-style="italic"/>
                 <text macro="title"/>
               </group>
@@ -524,7 +517,6 @@
                   </group>
                 </if>
               </choose>
-              <text macro="accessed"/>
             </group>
           </else-if>
           <else-if type="post-weblog" match="any">
@@ -544,7 +536,6 @@
                 <text value="publié le"/>
                 <text macro="issued-year-month-day"/>
               </group>
-              <text macro="accessed"/>
             </group>
           </else-if>
         </choose>
@@ -553,7 +544,6 @@
             <choose>
               <if type="webpage post-weblog" match="none">
                 <text macro="URL"/>
-                <text macro="accessed"/>
               </if>
             </choose>
           </if>
diff --git a/iso690-author-date-en.csl b/iso690-author-date-en.csl
index 91ce883ef4b..bb4fed3090c 100644
--- a/iso690-author-date-en.csl
+++ b/iso690-author-date-en.csl
@@ -21,7 +21,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(E), v1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+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>
@@ -118,7 +118,7 @@
       <if type="book thesis map motion_picture song manuscript" match="any">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -153,10 +153,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -176,7 +176,7 @@
       <else-if type="patent">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title"/>
+            <text variable="title" suffix="."/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
@@ -187,7 +187,7 @@
       <else>
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix="."/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -198,7 +198,7 @@
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" text-case="capitalize-first" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -304,12 +304,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -453,6 +457,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/iso690-author-date-fr.csl b/iso690-author-date-fr.csl
index 770f4f54ab8..13ad58e145f 100644
--- a/iso690-author-date-fr.csl
+++ b/iso690-author-date-fr.csl
@@ -24,7 +24,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(F), V1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+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>
@@ -127,7 +127,7 @@
       <if type="book thesis map motion_picture song manuscript" match="any">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title" font-style="italic"/>
+            <text variable="title" font-style="italic" suffix=". "/>
           </if>
           <else>
             <text variable="title" font-style="italic" suffix=", "/>
@@ -162,10 +162,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -185,7 +185,7 @@
       <else-if type="patent">
         <choose>
           <if variable="author editor translator" match="any">
-            <text variable="title"/>
+            <text variable="title" suffix="."/>
           </if>
           <else>
             <text variable="title" suffix=", "/>
@@ -313,12 +313,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix="&#160;: "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -462,6 +466,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/iso690-numeric-en.csl b/iso690-numeric-en.csl
index 1c6f11784b7..6a27e40259f 100644
--- a/iso690-numeric-en.csl
+++ b/iso690-numeric-en.csl
@@ -20,7 +20,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(E), V1.1</summary>
-    <updated>2013-05-31T20:00:00+01:00</updated>
+    <updated>2022-03-21T10:00:00+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>
@@ -116,7 +116,7 @@
   <macro name="title">
     <choose>
       <if type="book thesis map motion_picture song manuscript" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix=". "/>
       </if>
       <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
         <text variable="title" suffix=". "/>
@@ -137,10 +137,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -149,15 +149,15 @@
         <text variable="title" font-style="italic"/>
       </else-if>
       <else-if type="patent">
-        <text variable="title"/>
+        <text variable="title" suffix="."/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix="."/>
       </else>
     </choose>
     <choose>
       <if variable="URL">
-        <text term="online" prefix=" [" suffix="]"/>
+        <text term="online" text-case="capitalize-first" prefix=" "/>
       </if>
     </choose>
   </macro>
@@ -266,12 +266,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix=": "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -393,6 +397,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/iso690-numeric-fr.csl b/iso690-numeric-fr.csl
index 859d029587e..52540813769 100644
--- a/iso690-numeric-fr.csl
+++ b/iso690-numeric-fr.csl
@@ -20,7 +20,7 @@
     <category citation-format="numeric"/>
     <category field="generic-base"/>
     <summary>Style based on ISO 690:2010(F), V1.1</summary>
-    <updated>2020-11-19T21:30:00+00:00</updated>
+    <updated>2022-03-21T10:00:00+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>
@@ -116,7 +116,7 @@
   <macro name="title">
     <choose>
       <if type="book thesis map motion_picture song manuscript" match="any">
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix=". "/>
       </if>
       <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
         <text variable="title" suffix=". "/>
@@ -137,10 +137,10 @@
         </choose>
         <choose>
           <if variable="container-title">
-            <text variable="container-title" font-style="italic"/>
+            <text variable="container-title" font-style="italic" suffix="."/>
           </if>
           <else>
-            <text variable="event" font-style="italic"/>
+            <text variable="event" font-style="italic" suffix="."/>
           </else>
         </choose>
       </else-if>
@@ -149,10 +149,10 @@
         <text variable="title" font-style="italic"/>
       </else-if>
       <else-if type="patent">
-        <text variable="title"/>
+        <text variable="title" suffix="."/>
       </else-if>
       <else>
-        <text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic" suffix="."/>
       </else>
     </choose>
     <choose>
@@ -263,12 +263,16 @@
   </macro>
   <macro name="url">
     <choose>
-      <if variable="URL">
-        <group>
-          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
-          <text term="from" suffix="&#160;: "/>
-          <text variable="URL"/>
-        </group>
+      <if variable="DOI" match="none">
+        <choose>
+          <if variable="URL">
+            <group>
+              <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+              <text term="from" suffix=": "/>
+              <text variable="URL"/>
+            </group>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -390,6 +394,7 @@
             <text macro="accessed" suffix=". "/>
             <text macro="collection" suffix=". "/>
             <text macro="isbn" suffix=". "/>
+            <text macro="doi" suffix=". "/>
             <text macro="url"/>
           </group>
         </else-if>
diff --git a/journal-of-avian-biology.csl b/journal-of-avian-biology.csl
index 8bd45f68e4f..9c5f5f74858 100644
--- a/journal-of-avian-biology.csl
+++ b/journal-of-avian-biology.csl
@@ -13,7 +13,7 @@
     <category field="biology"/>
     <issn>0908-8857</issn>
     <eissn>1600-048X</eissn>
-    <updated>2014-06-10T12:00:00+00:00</updated>
+    <updated>2022-03-26T13:07:33+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">
@@ -39,6 +39,9 @@
     <names variable="author">
       <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
       <label form="short" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
     </names>
   </macro>
   <macro name="author-count">
@@ -121,62 +124,70 @@
       <key macro="author-count" names-min="3" names-use-first="3"/>
       <key variable="issued"/>
     </sort>
-    <layout>
-      <text macro="author"/>
-      <date variable="issued" prefix=" " suffix=".">
-        <date-part name="year"/>
-      </date>
-      <choose>
-        <if type="book">
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text prefix=" - " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="chapter">
-          <text macro="title" prefix=" "/>
-          <group prefix=". - ">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <names variable="editor translator">
-              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1"/>
-              <label form="short" prefix=" (" suffix=")," strip-periods="true"/>
-            </names>
-            <text variable="container-title" prefix=" " suffix="."/>
-            <text macro="edition" prefix=" "/>
-            <text variable="collection-title" prefix=" " suffix="."/>
-            <group suffix=".">
-              <text macro="publisher" prefix=" " suffix=","/>
-              <text macro="page-chapter" prefix=" "/>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text macro="title" prefix=" "/>
+        <choose>
+          <if type="book">
+            <group delimiter=". ">
+              <text macro="editor-translator"/>
+              <text prefix="&#8211; " macro="publisher"/>
             </group>
-          </group>
-        </else-if>
-        <else-if type="article article-journal review" match="any">
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text variable="container-title" form="short" prefix=" - "/>
-          <choose>
-            <if variable="page">
-              <text variable="volume" prefix=" "/>
-              <text variable="page" prefix=": " suffix="."/>
-            </if>
-            <else>
-              <text term="in press" prefix=" " suffix="."/>
-            </else>
-          </choose>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
+          </if>
+          <else-if type="chapter">
+            <group delimiter=". ">
+              <group delimiter=", " prefix=" &#8211; ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <names variable="editor translator">
+                    <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never" et-al-min="3" et-al-use-first="1"/>
+                    <label form="short" prefix=" (" suffix=")," strip-periods="true"/>
+                  </names>
+                </group>
+                <text variable="container-title"/>
+                <text macro="edition"/>
+                <text variable="collection-title"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="page-chapter"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article article-journal review" match="any">
+            <group delimiter=" ">
+              <text variable="container-title" form="short" prefix=" &#8211; "/>
+              <choose>
+                <if variable="page">
+                  <group delimiter=": ">
+                    <text variable="volume"/>
+                    <text variable="page"/>
+                  </group>
+                </if>
+                <else>
+                  <text variable="DOI" prefix=" &lt;https://doi.org/" suffix=">"/>
+                </else>
+              </choose>
+            </group>
+          </else-if>
+          <else-if type="thesis" match="any">
+            <group delimiter=", " prefix=" &#8211; ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+            </group>
+          </else-if>
+          <else>
             <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text variable="container-title" form="short" prefix=" - "/>
-          <text variable="volume" prefix=" "/>
-          <text variable="page" prefix=": " suffix="."/>
-        </else>
-      </choose>
+            <text variable="container-title" form="short" prefix=" &#8211; "/>
+            <text variable="volume" prefix=" "/>
+            <text variable="page" prefix=": "/>
+          </else>
+        </choose>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/journal-of-contemporary-water-research-and-education.csl b/journal-of-contemporary-water-research-and-education.csl
new file mode 100644
index 00000000000..69c1a18ef17
--- /dev/null
+++ b/journal-of-contemporary-water-research-and-education.csl
@@ -0,0 +1,625 @@
+<?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="display-and-sort" page-range-format="chicago">
+  <info>
+    <title>Journal of Contemporary Water Research and Education</title>
+    <title-short>JCWRE</title-short>
+    <id>http://www.zotero.org/styles/journal-of-contemporary-water-research-and-education</id>
+    <link href="http://www.zotero.org/styles/journal-of-contemporary-water-research-and-education" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="template"/>
+    <link href="https://ucowr.org/wp-content/uploads/2020/11/Original-Research-Article-Author-Instructions.pdf" rel="documentation"/>
+    <author>
+      <name>Michael Schramm</name>
+      <email>mpschramm@gmail.com</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <issn>1936-704X</issn>
+    <summary>A style for the Journal of Contemporary Water Research and Education.</summary>
+    <updated>2022-03-30T20:25:47+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="editor" form="verb-short">ed.</term>
+      <term name="container-author" form="verb">by</term>
+      <term name="translator" form="verb-short">trans.</term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
+        <group delimiter=". ">
+          <names variable="editor translator" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+          <names variable="director" delimiter=". ">
+            <label form="verb" text-case="capitalize-first" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <group prefix=", " delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <name and="text" delimiter=", "/>
+            <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient">
+    <choose>
+      <if type="personal_communication">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="substitute-title">
+    <choose>
+      <if type="article-magazine article-newspaper review review-book" match="any">
+        <text macro="container-title"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="contributors">
+    <group delimiter=". ">
+      <names variable="author">
+        <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <names variable="director"/>
+          <text macro="substitute-title"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" et-al-min="11" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <names variable="director"/>
+        <text macro="substitute-title"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="DOI: "/>
+            </if>
+            <else>
+              <text variable="URL" prefix="Available at: "/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+      <choose>
+        <if type="webpage post-weblog" match="any">
+          <date form="text" variable="issued" prefix="Accessed "/>
+        </if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date form="text" variable="accessed"/>
+          </group>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legislation motion_picture song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <choose>
+          <if variable="reviewed-title">
+            <group delimiter=". ">
+              <text variable="title" text-case="title" quotes="true"/>
+              <group delimiter=", ">
+                <text variable="reviewed-title" text-case="title" font-style="italic" prefix="Review of "/>
+                <names variable="reviewed-author">
+                  <label form="verb-short" text-case="lowercase" suffix=" "/>
+                  <name and="text" delimiter=", "/>
+                </names>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="title" text-case="title" font-style="italic" prefix="Review of "/>
+              <names variable="reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="legal_case interview patent" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="false"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=". ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" strip-periods="true"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" text-case="capitalize-first" prefix=". "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=", ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" prefix=", "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume">
+            <text variable="volume" prefix=" "/>
+            <group prefix=" (" suffix=")">
+              <choose>
+                <if variable="issue">
+                  <text variable="issue"/>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="month"/>
+                  </date>
+                </else>
+              </choose>
+            </group>
+          </if>
+          <else-if variable="issue">
+            <group delimiter=" " prefix=", ">
+              <text term="issue" form="short"/>
+              <text variable="issue"/>
+              <date variable="issued" prefix="(" suffix=")">
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <date variable="issued" prefix=", ">
+              <date-part name="month"/>
+            </date>
+          </else>
+        </choose>
+      </if>
+      <else-if type="legal_case">
+        <text variable="volume" prefix=", "/>
+        <text variable="container-title" prefix=" "/>
+        <text variable="page" prefix=" "/>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="page" match="none">
+            <group prefix=". ">
+              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+              <number variable="volume" form="numeric"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <choose>
+          <if variable="page">
+            <group prefix=", ">
+              <label suffix=" " variable="page" form="short"/>
+              <text variable="page"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group prefix=", " delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text variable="page" prefix=": "/>
+          </if>
+          <else>
+            <text variable="page" prefix=", "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <choose>
+              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+                <choose>
+                  <if variable="volume">
+                    <group>
+                      <text term="volume" form="short" suffix=" "/>
+                      <number variable="volume" form="numeric"/>
+                      <label variable="locator" form="short" prefix=", " suffix=" "/>
+                    </group>
+                  </if>
+                  <else>
+                    <label variable="locator" form="short" suffix=" "/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <label variable="locator" form="short" suffix=" "/>
+              </else>
+            </choose>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <number variable="volume" form="numeric" suffix=":"/>
+          </else-if>
+        </choose>
+        <text variable="locator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <text term="in" text-case="capitalize-first" suffix=":"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="webpage">
+        <text variable="container-title" text-case="title"/>
+      </if>
+      <else-if type="legal_case" match="none">
+        <group delimiter=" ">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+          <choose>
+            <if type="post-weblog">
+              <text value="(blog)"/>
+            </if>
+          </choose>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="(" suffix=")"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status" text-case="capitalize-first"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date-in-text">
+    <choose>
+      <if variable="issued">
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title-journal">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group delimiter=" ">
+      <choose>
+        <if variable="genre">
+          <text term="presented at"/>
+        </if>
+        <else>
+          <text term="presented at" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <choose>
+      <if variable="interviewer" type="interview" match="any">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else-if type="patent">
+        <group delimiter=" " prefix=". ">
+          <text variable="authority"/>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else>
+        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis personal_communication speech" match="any"/>
+      <else>
+        <group delimiter=" " prefix=". ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <choose>
+            <if type="report">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="legal_case">
+        <text variable="authority" prefix=". "/>
+      </if>
+      <else-if type="speech">
+        <group prefix=". " delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text macro="event"/>
+          </group>
+          <text variable="event-place"/>
+          <text macro="day-month"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine personal_communication" match="any">
+        <date variable="issued" form="text" prefix=", "/>
+      </else-if>
+      <else-if type="patent">
+        <group delimiter=", " prefix=", ">
+          <group delimiter=" ">
+            <text value="filed"/>
+            <date variable="submitted" form="text"/>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if variable="issued submitted" match="all">
+                <text term="and"/>
+              </if>
+            </choose>
+            <text value="issued"/>
+            <date variable="issued" form="text"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-journal" match="any"/>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text macro="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <choose>
+          <if variable="issued accessed" match="any">
+            <group delimiter=" ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text macro="contributors-short"/>
+              <text macro="date-in-text"/>
+            </group>
+          </else>
+        </choose>
+        <text macro="point-locators"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
+    <sort>
+      <key macro="contributors"/>
+      <key variable="issued"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="contributors"/>
+        <text macro="date"/>
+        <text macro="title"/>
+      </group>
+      <text macro="description"/>
+      <text macro="secondary-contributors" prefix=". "/>
+      <text macro="container-title" prefix=". "/>
+      <text macro="container-contributors"/>
+      <text macro="edition"/>
+      <text macro="collection-title-journal" prefix=", " suffix=", "/>
+      <text macro="locators"/>
+      <text macro="collection-title" prefix=". "/>
+      <text macro="issue"/>
+      <text macro="locators-chapter"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/mary-ann-liebert-vancouver.csl b/mary-ann-liebert-vancouver.csl
index f7759c6382b..ca52c6dd215 100644
--- a/mary-ann-liebert-vancouver.csl
+++ b/mary-ann-liebert-vancouver.csl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="text" demote-non-dropping-particle="sort-only" default-locale="en-US">
-  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Mary Ann Liebert - Vancouver</title>
     <title-short>MAL</title-short>
@@ -14,7 +13,7 @@
     </author>
     <category citation-format="numeric"/>
     <category field="generic-base"/>
-    <updated>2022-03-09T16:51:49+00:00</updated>
+    <updated>2022-03-23T07:53:38+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">
@@ -125,13 +124,9 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="3">
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date"/>
-      <key variable="title"/>
-    </sort>
+  <bibliography et-al-min="4" et-al-use-first="3" second-field-align="flush">
     <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
       <group delimiter=". ">
         <text macro="author"/>
         <choose>
diff --git a/mrs-bulletin.csl b/mrs-bulletin.csl
new file mode 100644
index 00000000000..24c5eaa01fe
--- /dev/null
+++ b/mrs-bulletin.csl
@@ -0,0 +1,236 @@
+<?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">
+  <info>
+    <title>MRS Bulletin</title>
+    <title-short>MRSB</title-short>
+    <id>http://www.zotero.org/styles/mrs-bulletin</id>
+    <link href="http://www.zotero.org/styles/mrs-bulletin" rel="self"/>
+    <link href="http://www.zotero.org/styles/science-without-titles" rel="template"/>
+    <link href="https://www.springer.com/journal/43577/submission-guidelines#Instructions%20for%20Authors_References" rel="documentation"/>
+    <author>
+      <name>Tyler Harvey</name>
+      <email>tyler.r.harvey@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <issn>0883-7694</issn>
+    <eissn>1938-1425</eissn>
+    <summary>MRS Bulletin, using Science reference style and superscript citations. Adapted from 'Science without titles' style from Julian Onions et al.</summary>
+    <updated>2021-07-20T13:44:48+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">
+    <names variable="editor" delimiter=", ">
+      <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="page" match="none">
+        <text macro="access-value"/>
+      </if>
+      <else-if is-numeric="page" match="none">
+        <text macro="access-value"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="access-value">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix=", doi:"/>
+      </if>
+      <else>
+        <group prefix=" (" suffix=")">
+          <text value="available at "/>
+          <text variable="URL"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="article-details">
+    <group delimiter=", ">
+      <group delimiter=". ">
+        <text form="short" variable="container-title" font-style="italic"/>
+        <text variable="volume" font-weight="bold"/>
+      </group>
+      <text variable="page"/>
+    </group>
+    <text macro="issued" prefix=" (" suffix=")"/>
+    <text macro="access"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page" form="short"/>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <text term="edition" form="short"/>
+          <number variable="edition" form="numeric"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="40" et-al-use-first="1" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=", ">
+        <text macro="author"/>
+        <choose>
+          <if type="thesis">
+            <group delimiter=" ">
+              <group delimiter=", ">
+                <group>
+                  <!-- Always print, even if no university given -->
+                  <text value="thesis"/>
+                </group>
+                <text macro="publisher"/>
+              </group>
+              <text macro="issued" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture song chapter paper-conference" match="any">
+            <group delimiter=" ">
+              <choose>
+                <if type="chapter paper-conference" match="any">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <text term="in"/>
+                      <text variable="container-title" font-style="italic"/>
+                    </group>
+                    <text macro="editor"/>
+                  </group>
+                </if>
+                <else>
+                  <text macro="title"/>
+                </else>
+              </choose>
+              <group prefix="(" suffix=")" delimiter="; ">
+                <group delimiter=", ">
+                  <text macro="publisher"/>
+                  <text macro="edition"/>
+                  <text macro="issued"/>
+                </group>
+                <text variable="URL"/>
+              </group>
+            </group>
+            <group delimiter=" of ">
+              <group>
+                <label variable="volume" form="short" suffix=" "/>
+                <number variable="volume"/>
+              </group>
+              <text variable="collection-title" font-style="italic"/>
+            </group>
+            <choose>
+              <if type="chapter paper-conference" match="any">
+                <text macro="pages"/>
+              </if>
+            </choose>
+          </else-if>
+          <else-if type="article-journal">
+            <choose>
+              <if variable="page">
+                <choose>
+                  <if is-numeric="page" match="none">
+                    <group>
+                      <group delimiter=", ">
+                        <text variable="container-title" form="short" font-style="italic"/>
+                        <group>
+                          <text term="in press"/>
+                        </group>
+                      </group>
+                      <text macro="access"/>
+                    </group>
+                  </if>
+                  <else>
+                    <text macro="article-details"/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <text macro="article-details"/>
+              </else>
+            </choose>
+          </else-if>
+          <else-if type="report">
+            <group>
+              <group delimiter=", ">
+                <text variable="title" quotes="true"/>
+                <text variable="collection-title" font-style="italic"/>
+              </group>
+              <group prefix=" (" suffix=")" delimiter=", ">
+                <group delimiter=" ">
+                  <text variable="genre" form="short"/>
+                  <number variable="number"/>
+                </group>
+                <text variable="publisher"/>
+                <text variable="publisher-place"/>
+                <text macro="issued"/>
+              </group>
+            </group>
+            <text macro="pages"/>
+            <text macro="access"/>
+          </else-if>
+          <else>
+            <group>
+              <group delimiter=", ">
+                <text macro="editor"/>
+                <group delimiter=". ">
+                  <text macro="title"/>
+                  <text form="short" variable="container-title" font-style="italic"/>
+                  <text variable="volume" font-weight="bold"/>
+                </group>
+              </group>
+              <text macro="issued" prefix=" (" suffix=")"/>
+            </group>
+            <text macro="pages"/>
+            <text macro="access"/>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/national-library-of-medicine-grant-proposals.csl b/national-library-of-medicine-grant-proposals.csl
index f657db88ec9..fdda8f5b2c7 100644
--- a/national-library-of-medicine-grant-proposals.csl
+++ b/national-library-of-medicine-grant-proposals.csl
@@ -1,5 +1,5 @@
 <?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" default-locale="en-US">
   <info>
     <title>National Library of Medicine (grant proposals with PMCID/PMID)</title>
     <title-short>NLM</title-short>
diff --git a/respiratory-care-journal.csl b/respiratory-care-journal.csl
new file mode 100644
index 00000000000..91311b3f87b
--- /dev/null
+++ b/respiratory-care-journal.csl
@@ -0,0 +1,192 @@
+<?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">
+  <info>
+    <title>Respiratory Care Journal</title>
+    <title-short>RC</title-short>
+    <id>http://www.zotero.org/styles/respiratory-care-journal</id>
+    <link href="http://www.zotero.org/styles/respiratory-care-journal" rel="self"/>
+    <link href="http://www.zotero.org/styles/haematologica" rel="template"/>
+    <link href="http://rc.rcjournal.com/content/author-guidelines#references" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0020-1324</issn>
+    <eissn>1943-3654</eissn>
+    <updated>2022-03-31T12:01: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>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label strip-periods="true" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label strip-periods="true" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-newspaper report" match="any">
+        <date variable="issued" form="text"/>
+      </if>
+      <else>
+        <date variable="issued" form="text" date-parts="year"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter="; ">
+      <group delimiter=" ">
+        <text variable="genre" text-case="title"/>
+        <text variable="number"/>
+      </group>
+      <group delimiter=": ">
+        <choose>
+          <if type="thesis" match="none">
+            <text variable="publisher-place"/>
+          </if>
+        </choose>
+        <text variable="publisher"/>
+      </group>
+      <choose>
+        <if variable="URL" match="none">
+          <text macro="date" prefix=" "/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal" match="any">
+        <choose>
+          <if variable="page volume" match="none">
+            <text variable="DOI" text-case="capitalize-first" prefix=" doi:"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="webpage post-weblog" match="any">
+        <group delimiter=", " prefix=" (" suffix=")">
+          <text variable="URL"/>
+          <text macro="accessed-date"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <group delimiter=" ">
+      <text term="accessed" text-case="capitalize-first"/>
+      <date form="text" variable="accessed" text-case="capitalize-first"/>
+    </group>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="container-title" form="short" strip-periods="true"/>
+      </if>
+      <else>
+        <text variable="container-title" font-style="italic"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography delimiter-precedes-et-al="always" et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture patent report song thesis" match="any">
+            <group delimiter=". ">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text macro="edition"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <text macro="editor"/>
+              </group>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="normal"/>
+                <text macro="edition"/>
+              </group>
+              <group delimiter=":">
+                <text macro="publisher"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="article-newspaper article-magazine" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", ">
+                <text macro="container-title"/>
+                <text macro="date"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=";">
+                <group delimiter=" ">
+                  <text macro="container-title"/>
+                  <choose>
+                    <if variable="page" match="any">
+                      <text macro="date"/>
+                    </if>
+                  </choose>
+                </group>
+                <group delimiter=":">
+                  <group>
+                    <text variable="volume"/>
+                    <text variable="issue" prefix="(" suffix=")"/>
+                  </group>
+                  <text variable="page"/>
+                </group>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/science-china-materials.csl b/science-china-materials.csl
new file mode 100644
index 00000000000..f6898a0641d
--- /dev/null
+++ b/science-china-materials.csl
@@ -0,0 +1,141 @@
+<?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">
+  <info>
+    <title>SCIENCE CHINA Materials</title>
+    <title-short>SCM</title-short>
+    <id>http://www.zotero.org/styles/science-china-materials</id>
+    <link href="http://www.zotero.org/styles/science-china-materials" rel="self"/>
+    <link href="http://www.zotero.org/styles/xenotransplantation" rel="template"/>
+    <link href="https://www.sciengine.com/authorCenter/guide/Manuscript/XTQhzDPnrXRQMhhph" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <issn>2095-8226</issn>
+    <eissn>2199-4501</eissn>
+    <updated>2022-04-13T08:45:04+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="author">
+    <group suffix=".">
+      <names variable="author">
+        <name font-variant="normal" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+        <label form="short" prefix=", "/>
+        <et-al font-style="italic" font-variant="normal"/>
+        <substitute>
+          <names variable="editor"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always" initialize-with="" delimiter=", "/>
+      <label form="short" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title" quotes="false"/>
+  </macro>
+  <macro name="year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="journal">
+    <group delimiter=", ">
+      <text variable="container-title" form="short" strip-periods="true"/>
+      <text macro="year"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="conference">
+    <group delimiter=", ">
+      <text variable="container-title"/>
+      <group delimiter=" ">
+        <text variable="publisher"/>
+        <text macro="year"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="book-publisher">
+    <group delimiter=", ">
+      <group delimiter=": ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
+      <text macro="year"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <group delimiter=":">
+        <text variable="citation-number"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="6" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
+    <layout suffix=".">
+      <text variable="citation-number"/>
+      <text macro="author" suffix=". "/>
+      <text macro="title" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <text macro="edition" suffix=" "/>
+          <text macro="book-publisher" suffix="."/>
+        </if>
+        <else-if type="paper-conference">
+          <group suffix="." delimiter=", ">
+            <text macro="conference"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <text term="in" text-case="capitalize-first" suffix=": "/>
+          <text macro="editor" suffix=" "/>
+          <text variable="container-title" suffix=". "/>
+          <text macro="edition" suffix=" "/>
+          <group suffix=".">
+            <text macro="book-publisher"/>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else-if>
+        <else-if type="article-journal">
+          <group suffix=".">
+            <text macro="journal"/>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix="." delimiter=" ">
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="volume"/>
+            </group>
+            <text macro="year"/>
+            <text variable="page"/>
+          </group>
+          <text variable="URL" prefix=" "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/spanish-legal.csl b/spanish-legal.csl
index 43316e1fd70..407d9cd8d07 100644
--- a/spanish-legal.csl
+++ b/spanish-legal.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="es-ES" version="1.0" demote-non-dropping-particle="sort-only">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="es-ES">
   <info>
     <title>Spanish Legal (Español)</title>
     <id>http://www.zotero.org/styles/spanish-legal</id>
@@ -111,7 +111,7 @@
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
       <else>
-        <text variable="title" text-case="capitalize-first" prefix="“" suffix="”"/>
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
       </else>
     </choose>
   </macro>
@@ -121,7 +121,7 @@
         <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", cit." form="short"/>
       </if>
       <else>
-        <text variable="title" text-case="capitalize-first" prefix="“" suffix="”, cit." form="short"/>
+        <text variable="title" text-case="capitalize-first" quotes="true" suffix=", cit." form="short"/>
       </else>
     </choose>
   </macro>
diff --git a/style-manual-australian-government.csl b/style-manual-australian-government.csl
index a6f7c8ec2db..d22f9e86a5f 100644
--- a/style-manual-australian-government.csl
+++ b/style-manual-australian-government.csl
@@ -16,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Snooks style manual Australia Harvard author-date style</summary>
-    <updated>2021-08-19T14:32:14+00:00</updated>
+    <updated>2022-03-21T08:44:06+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">
@@ -155,13 +155,13 @@
             </group>
           </if>
           <else-if type="chapter paper-conference" match="any">
-            <group>
+            <group delimiter=", ">
               <text macro="title"/>
               <group delimiter=" ">
-                <text term="in" prefix=", "/>
-                <text macro="editor" prefix=" "/>
+                <text term="in"/>
+                <text macro="editor"/>
+                <text variable="container-title" font-style="italic"/>
               </group>
-              <text variable="container-title" font-style="italic"/>
               <text variable="collection-title"/>
               <text variable="event"/>
               <text macro="publisher"/>
diff --git a/the-journal-of-egyptian-archaeology.csl b/the-journal-of-egyptian-archaeology.csl
index 8e0558d0f8b..8182b81fd46 100644
--- a/the-journal-of-egyptian-archaeology.csl
+++ b/the-journal-of-egyptian-archaeology.csl
@@ -6,15 +6,15 @@
     <id>http://www.zotero.org/styles/the-journal-of-egyptian-archaeology</id>
     <link href="http://www.zotero.org/styles/the-journal-of-egyptian-archaeology" rel="self"/>
     <link href="http://www.zotero.org/styles/journal-of-the-history-of-collections" rel="template"/>
-    <link href="http://www.ees.ac.uk/publications/journal-egyptian-archaeology.html" rel="documentation"/>
+    <link href="https://www.ees.ac.uk/writing-for-the-jea" rel="documentation"/>
+    <link href="https://journals.sagepub.com/pb-assets/cmscontent/EGA/JEA_Referencing_Style.pdf" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
-      <email>obrienpat86@gmail.com</email>
     </author>
     <category citation-format="note"/>
     <category field="history"/>
     <issn>0307-5133</issn>
-    <updated>2018-01-04T11:08:07+00:00</updated>
+    <updated>2022-03-18T08:56: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">
@@ -28,6 +28,10 @@
       <term name="close-quote">’</term>
       <term name="open-inner-quote">“</term>
       <term name="close-inner-quote">”</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
     </terms>
   </locale>
   <macro name="author">
@@ -79,7 +83,7 @@
     <group delimiter=" ">
       <text term="in" suffix=" "/>
       <names variable="editor">
-        <name form="short" and="text" initialize-with=". "/>
+        <name form="short" and="text" et-al-min="2" et-al-use-first="1" initialize-with=". "/>
         <label form="short" prefix=" (" suffix=")" strip-periods="false"/>
         <substitute>
           <names variable="editor"/>
@@ -151,10 +155,6 @@
       </if>
     </choose>
   </macro>
-  <macro name="pageref-subsequent">
-    <label variable="locator" form="short" suffix=" "/>
-    <text variable="locator"/>
-  </macro>
   <macro name="volref">
     <group delimiter=" ">
       <text variable="volume"/>
@@ -206,7 +206,7 @@
         <choose>
           <if variable="URL" match="any">
             <group delimiter=" ">
-              <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+              <text variable="URL" prefix="&lt;" suffix=">"/>
               <text term="accessed" suffix=" "/>
             </group>
             <date variable="accessed">
@@ -226,7 +226,7 @@
           <group delimiter=", ">
             <text macro="author-short"/>
             <text macro="container-short"/>
-            <text macro="pageref-subsequent"/>
+            <text macro="pageref"/>
           </group>
         </if>
         <else>
diff --git a/united-states-international-trade-commission.csl b/united-states-international-trade-commission.csl
index 5f88f74ee62..f477a13946d 100644
--- a/united-states-international-trade-commission.csl
+++ b/united-states-international-trade-commission.csl
@@ -27,7 +27,7 @@
     <category citation-format="note"/>
     <category field="generic-base"/>
     <summary>A bibliographical style file for the United States International Trade Commission</summary>
-    <updated>2021-10-07T15:21:08+00:00</updated>
+    <updated>2022-03-04T21:24:35+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">
@@ -195,7 +195,7 @@
           <choose>
             <if type="article-magazine" match="all" variable="author">
               <names variable="author">
-                <name and="text" delimiter-precedes-last="always" name-as-sort-order="first"/>
+                <name and="text"/>
                 <substitute>
                   <text macro="editor"/>
                 </substitute>
@@ -329,7 +329,14 @@
         </choose>
       </else-if>
       <else-if type="legislation bill" match="any">
-        <text variable="title" text-case="title"/>
+        <choose>
+          <if match="any" variable="title-short">
+            <text variable="title" form="short" text-case="title"/>
+          </if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
       </else-if>
       <else-if type="book graphic map song" match="any">
         <choose>
@@ -419,14 +426,13 @@
         </group>
       </else-if>
       <else-if type="bill legislation legal_case interview patent" match="any">
-        <text variable="title" text-case="title"/>
+        <text variable="title" form="short" text-case="title"/>
       </else-if>
       <else-if type="motion_picture" match="all">
         <choose>
           <if match="any" variable="issued">
-            <group>
-              <text variable="title" text-case="title" quotes="true" suffix=","/>
-              <date form="text" variable="issued" prefix=" " suffix=". "/>
+            <group delimiter=". ">
+              <text variable="title" text-case="title" quotes="true"/>
               <text variable="dimensions" prefix="Video, "/>
             </group>
           </if>
@@ -713,7 +719,6 @@
                 <text variable="section"/>
               </group>
               <group delimiter=" ">
-                <text variable="volume"/>
                 <text variable="container-title"/>
                 <text variable="page-first"/>
               </group>
@@ -933,7 +938,9 @@
               <if is-uncertain-date="issued">
                 <date variable="issued" form="numeric" date-parts="year" prefix="[" suffix="?]"/>
               </if>
-              <else-if match="any" variable="abstract"/>
+              <else-if match="any" variable="abstract">
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else-if>
               <else>
                 <date form="text" variable="issued"/>
               </else>
@@ -972,6 +979,7 @@
         <text variable="status"/>
       </else-if>
       <else-if variable="accessed URL" match="all"/>
+      <else-if type="legislation" match="any"/>
       <else>
         <text term="no date" form="short"/>
       </else>
@@ -1147,7 +1155,7 @@
       <if type="graphic map" match="any">
         <choose>
           <if variable="publisher publisher-place" match="none">
-            <text macro="issued"/>
+            <text macro="issued-note"/>
           </if>
         </choose>
       </if>
@@ -1156,7 +1164,7 @@
   <macro name="issue-note">
     <choose>
       <if type="bill legislation legal_case" match="any">
-        <text macro="issued" prefix="(" suffix=")"/>
+        <text macro="issued-note"/>
       </if>
       <else-if type="speech" match="any">
         <date form="text" date-parts="year-month-day" variable="issued"/>
@@ -1164,15 +1172,15 @@
       <else-if type="article-journal">
         <choose>
           <if variable="volume issue" match="any">
-            <text macro="issued"/>
+            <text macro="issued-note"/>
           </if>
           <else>
-            <text macro="issued"/>
+            <text macro="issued-note"/>
           </else>
         </choose>
       </else-if>
       <else-if type="article-newspaper">
-        <text macro="issued"/>
+        <text macro="issued-note"/>
       </else-if>
       <else-if type="manuscript thesis speech" match="any">
         <group delimiter=", ">
@@ -1181,7 +1189,7 @@
           </choose>
           <text variable="event"/>
           <text variable="event-place"/>
-          <text macro="issued"/>
+          <text macro="issued-note"/>
         </group>
       </else-if>
       <else-if variable="publisher-place event-place publisher" match="none">
@@ -1194,11 +1202,11 @@
               <text macro="publisher"/>
             </group>
           </group>
-          <text macro="issued"/>
+          <text macro="issued-note"/>
         </group>
       </else-if>
       <else>
-        <text macro="issued"/>
+        <text macro="issued-note"/>
       </else>
     </choose>
   </macro>
@@ -1218,7 +1226,7 @@
   </macro>
   <macro name="issue-join-with-period">
     <choose>
-      <if type="article-journal bill legislation legal_case" match="none">
+      <if type="article-journal bill legal_case" match="none">
         <choose>
           <if type="speech" variable="publisher publisher-place" match="any">
             <text macro="issue"/>
@@ -1248,7 +1256,7 @@
   <macro name="issue">
     <choose>
       <if type="bill legislation legal_case" match="any">
-        <text macro="issued" prefix="(" suffix=")"/>
+        <text macro="issued"/>
       </if>
       <else-if type="article-journal">
         <choose>
@@ -1338,7 +1346,6 @@
       </choose>
       <choose>
         <if type="legislation" match="any">
-          <text variable="URL"/>
           <group prefix="(" suffix=")">
             <text term="accessed" form="short" text-case="lowercase"/>
             <date form="text" variable="accessed" prefix=" "/>
@@ -1417,6 +1424,75 @@
       </else>
     </choose>
   </macro>
+  <macro name="issued-note">
+    <choose>
+      <if match="any" variable="issued">
+        <choose>
+          <if type="legal_case" match="any">
+            <group>
+              <text variable="authority"/>
+              <choose>
+                <if match="any" variable="container-title">
+                  <date form="text" date-parts="year-month-day" variable="issued"/>
+                </if>
+                <else>
+                  <date form="text" date-parts="year-month-day" variable="issued"/>
+                </else>
+              </choose>
+            </group>
+          </if>
+          <else-if type="article book bill chapter legislation motion_picture paper-conference song thesis" match="any">
+            <choose>
+              <if match="all" is-uncertain-date="issued">
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </if>
+              <else-if match="any" variable="abstract">
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else-if>
+              <else>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else>
+            </choose>
+          </else-if>
+          <else-if type="patent" match="all">
+            <group delimiter=", ">
+              <group delimiter=" ">
+                <text value="filed"/>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </group>
+              <group delimiter=" ">
+                <choose>
+                  <if match="all" variable="issued submitted">
+                    <text term="and"/>
+                  </if>
+                </choose>
+                <text value="issued"/>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <choose>
+              <if match="all" is-uncertain-date="issued">
+                <date form="text" variable="issued" prefix="[" suffix="?]"/>
+              </if>
+              <else>
+                <date form="text" date-parts="year-month-day" variable="issued"/>
+              </else>
+            </choose>
+          </else>
+        </choose>
+      </if>
+      <else-if match="any" variable="status">
+        <text variable="status"/>
+      </else-if>
+      <else-if match="all" variable="accessed URL"/>
+      <else-if type="legislation" match="any"/>
+      <else>
+        <text term="no date"/>
+      </else>
+    </choose>
+  </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
     <layout suffix="." delimiter="; ">
       <group delimiter=", ">
@@ -1444,7 +1520,6 @@
               </group>
               <text macro="issue-note-join-with-space"/>
             </group>
-            <text macro="locators-newspaper"/>
             <text macro="point-locators-join-with-comma"/>
           </group>
           <text macro="point-locators-join-with-colon"/>
@@ -1464,7 +1539,7 @@
       <group delimiter=". ">
         <group delimiter=": ">
           <group delimiter=", ">
-            <group delimiter=" ">
+            <group delimiter=". ">
               <group delimiter=". ">
                 <group delimiter=" ">
                   <group delimiter=", ">
diff --git a/urad-rs-za-makroekonomske-analize-in-razvoj.csl b/urad-rs-za-makroekonomske-analize-in-razvoj.csl
index 8e31a491175..6a17d01c056 100644
--- a/urad-rs-za-makroekonomske-analize-in-razvoj.csl
+++ b/urad-rs-za-makroekonomske-analize-in-razvoj.csl
@@ -13,7 +13,7 @@
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2021-09-22T16:14:55+00:00</updated>
+    <updated>2022-03-15T10:15:20+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="container-contributors-booklike">
@@ -446,9 +446,15 @@
           <else-if type="post post-weblog webpage" variable="container-title" match="any">
             <text variable="title"/>
           </else-if>
-          <else-if type="legislation book" match="any">
+          <else-if type="book" match="any">
             <text variable="title" font-style="italic"/>
           </else-if>
+          <else-if type="legislation" match="any">
+            <group delimiter=" &#8211; ">
+              <text variable="title-short"/>
+              <text variable="title"/>
+            </group>
+          </else-if>
           <else>
             <text variable="title" font-style="normal"/>
           </else>
@@ -809,9 +815,9 @@
         <choose>
           <if variable="collection-editor editor issue page volume" match="none">
             <group delimiter=" ">
-              <group delimiter=" ">
+              <group>
                 <text term="presented at" text-case="capitalize-first"/>
-                <text variable="event"/>
+                <text variable="event" prefix=" "/>
                 <choose>
                   <if match="any" variable="note">
                     <group delimiter=" ">
@@ -823,9 +829,9 @@
                     </group>
                   </if>
                   <else>
-                    <group>
+                    <group delimiter=", " prefix=", ">
                       <text variable="genre"/>
-                      <text variable="event-place" prefix=", "/>
+                      <text variable="event-place"/>
                     </group>
                   </else>
                 </choose>
diff --git a/vancouver-author-date.csl b/vancouver-author-date.csl
index 27ad015cbe5..13b1bc2d023 100644
--- a/vancouver-author-date.csl
+++ b/vancouver-author-date.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (author-date)</title>
     <id>http://www.zotero.org/styles/vancouver-author-date</id>
diff --git a/vancouver-brackets-no-et-al.csl b/vancouver-brackets-no-et-al.csl
index 6c4b746c887..9a814ecf897 100644
--- a/vancouver-brackets-no-et-al.csl
+++ b/vancouver-brackets-no-et-al.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (brackets, no "et al.")</title>
     <id>http://www.zotero.org/styles/vancouver-brackets-no-et-al</id>
diff --git a/vancouver-brackets-only-year-no-issue.csl b/vancouver-brackets-only-year-no-issue.csl
index d7f26d1185a..34b3f33e2d3 100644
--- a/vancouver-brackets-only-year-no-issue.csl
+++ b/vancouver-brackets-only-year-no-issue.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Vancouver (brackets, only year in date, no issue numbers)</title>
diff --git a/vancouver-brackets.csl b/vancouver-brackets.csl
index 7e3025719b2..8314208e5bf 100644
--- a/vancouver-brackets.csl
+++ b/vancouver-brackets.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (brackets)</title>
     <id>http://www.zotero.org/styles/vancouver-brackets</id>
diff --git a/vancouver-fr-ca.csl b/vancouver-fr-ca.csl
index 1b9bbff2bb5..e625f525e41 100644
--- a/vancouver-fr-ca.csl
+++ b/vancouver-fr-ca.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal" default-locale="fr-CA">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal" default-locale="fr-CA">
   <info>
     <title>Vancouver (Français - Canada)</title>
     <id>http://www.zotero.org/styles/vancouver-fr-ca</id>
diff --git a/vancouver-imperial-college-london.csl b/vancouver-imperial-college-london.csl
index 6d55fb8c1f1..0fa942ac06d 100644
--- a/vancouver-imperial-college-london.csl
+++ b/vancouver-imperial-college-london.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="expanded" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="expanded" default-locale="en-GB">
   <info>
     <title>Imperial College London - Vancouver</title>
     <id>http://www.zotero.org/styles/vancouver-imperial-college-london</id>
diff --git a/vancouver-superscript-brackets-only-year.csl b/vancouver-superscript-brackets-only-year.csl
index e1ddddae06d..18eee883b62 100644
--- a/vancouver-superscript-brackets-only-year.csl
+++ b/vancouver-superscript-brackets-only-year.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (superscript, brackets, only year in date)</title>
     <id>http://www.zotero.org/styles/vancouver-superscript-brackets-only-year</id>
diff --git a/vancouver-superscript-only-year.csl b/vancouver-superscript-only-year.csl
index c08731870f1..0130fccc31c 100644
--- a/vancouver-superscript-only-year.csl
+++ b/vancouver-superscript-only-year.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (superscript, only year in date, no issue numbers)</title>
     <id>http://www.zotero.org/styles/vancouver-superscript-only-year</id>
diff --git a/vancouver-superscript.csl b/vancouver-superscript.csl
index 86a4bd217d8..881a228e59f 100644
--- a/vancouver-superscript.csl
+++ b/vancouver-superscript.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver (superscript)</title>
     <id>http://www.zotero.org/styles/vancouver-superscript</id>
diff --git a/vancouver.csl b/vancouver.csl
index edbb69b411a..71c92032289 100644
--- a/vancouver.csl
+++ b/vancouver.csl
@@ -1,5 +1,5 @@
 <?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" page-range-format="minimal">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" initialize-with-hyphen="false" page-range-format="minimal">
   <info>
     <title>Vancouver</title>
     <id>http://www.zotero.org/styles/vancouver</id>