diff --git a/cardiff-university-biosi-and-carbs-harvard.csl b/cardiff-university-harvard.csl
similarity index 96%
rename from cardiff-university-biosi-and-carbs-harvard.csl
rename to cardiff-university-harvard.csl
index 14ed630521c..4a1df22e8e9 100644
--- a/cardiff-university-biosi-and-carbs-harvard.csl
+++ b/cardiff-university-harvard.csl
@@ -2,11 +2,11 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
-    <title>Cardiff University BIOSI and CARBS - Harvard</title>
-    <id>http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard</id>
-    <link href="http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard" rel="self"/>
-    <link href="https://xerte.cardiff.ac.uk/play_12072" rel="documentation"/>
-    <link href="https://xerte.cardiff.ac.uk/play_10324" rel="documentation"/>
+    <title>Cardiff University - Harvard</title>
+    <id>http://www.zotero.org/styles/cardiff-university-harvard</id>
+    <link href="http://www.zotero.org/styles/cardiff-university-harvard" rel="self"/>
+    <link href="https://xerte.cardiff.ac.uk/play_4191" rel="documentation"/>
+    <link href="https://xerte.cardiff.ac.uk/play_4069" rel="documentation"/>
     <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
     <author>
       <name>Zoe Young</name>
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
index 9f126b30511..8c133354b38 100644
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -526,7 +526,7 @@
   </macro>
   <macro name="description">
     <choose>
-      <if type="interview">
+      <if variable="interviewer" type="interview" match="any">
         <group delimiter=". ">
           <text macro="interviewer"/>
           <text variable="medium" text-case="capitalize-first"/>
diff --git a/database.csl b/database.csl
index 9e5b0678618..d8a871a48a1 100644
--- a/database.csl
+++ b/database.csl
@@ -25,8 +25,12 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name and="text" delimiter-precedes-last="never" et-al-min="4" et-al-use-first="3" initialize-with=". " name-as-sort-order="all"/>
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
       <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
     </names>
   </macro>
   <macro name="publisher">
diff --git a/demographic-research.csl b/demographic-research.csl
index 118a411cbf3..0c36a880f22 100644
--- a/demographic-research.csl
+++ b/demographic-research.csl
@@ -4,7 +4,7 @@
     <title>Demographic Research</title>
     <id>http://www.zotero.org/styles/demographic-research</id>
     <link href="http://www.zotero.org/styles/demographic-research" rel="self"/>
-    <link href="http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard" rel="template"/>
+    <link href="http://www.zotero.org/styles/cardiff-university-harvard" rel="template"/>
     <link href="http://www.demographic-research.org/files/demographic_research_reference_guidelines.pdf" rel="documentation"/>
     <author>
       <name>Ilya Kashnitsky</name>
diff --git a/dependent/human-molecular-genetics.csl b/dependent/human-molecular-genetics.csl
deleted file mode 100644
index e802f4ae027..00000000000
--- a/dependent/human-molecular-genetics.csl
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-GB">
-  <info>
-    <title>Human Molecular Genetics</title>
-    <title-short>HMG</title-short>
-    <id>http://www.zotero.org/styles/human-molecular-genetics</id>
-    <link href="http://www.zotero.org/styles/human-molecular-genetics" rel="self"/>
-    <link href="http://www.zotero.org/styles/database" rel="independent-parent"/>
-    <link href="http://www.oxfordjournals.org/our_journals/hmg/for_authors/general.html" rel="documentation"/>
-    <category citation-format="numeric"/>
-    <category field="medicine"/>
-    <issn>0964-6906</issn>
-    <eissn>1460-2083</eissn>
-    <updated>2019-07-26T21:58:08+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>
-</style>
diff --git a/dependent/international-studies-quarterly.csl b/dependent/international-studies-quarterly.csl
index 29e28e9a34c..3d8e8447929 100644
--- a/dependent/international-studies-quarterly.csl
+++ b/dependent/international-studies-quarterly.csl
@@ -4,8 +4,8 @@
     <title>International Studies Quarterly</title>
     <id>http://www.zotero.org/styles/international-studies-quarterly</id>
     <link href="http://www.zotero.org/styles/international-studies-quarterly" rel="self"/>
-    <link href="http://www.zotero.org/styles/international-studies-association" rel="independent-parent"/>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1111/%28ISSN%291468-2478/homepage/ForAuthors.html" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="independent-parent"/>
+    <link href="https://academic.oup.com/isq/pages/general_instructions" rel="documentation"/>
     <category citation-format="author-date"/>
     <category field="political_science"/>
     <issn>1468-2478</issn>
diff --git a/dependent/prifysgol-caerdydd-harvard.csl b/dependent/prifysgol-caerdydd-harvard.csl
index d8266bc7f07..f5e6a1ea157 100644
--- a/dependent/prifysgol-caerdydd-harvard.csl
+++ b/dependent/prifysgol-caerdydd-harvard.csl
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="cy-GB">
   <info>
-    <title>Prifysgol Caerdydd - Harvard (Cymraeg)</title>
+    <title>Prifysgol Caerdydd - hen Harvard (Cymraeg)</title>
     <id>http://www.zotero.org/styles/prifysgol-caerdydd-harvard</id>
     <link href="http://www.zotero.org/styles/prifysgol-caerdydd-harvard" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university" rel="independent-parent"/>
-    <link href="https://xerte.cardiff.ac.uk/play_4069" rel="documentation"/>
-    <link href="https://xerte.cardiff.ac.uk/play_5253" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="independent-parent"/>
     <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
     <author>
       <name>Zoe Young</name>
diff --git a/harvard-cardiff-university.csl b/harvard-cardiff-university-old.csl
similarity index 96%
rename from harvard-cardiff-university.csl
rename to harvard-cardiff-university-old.csl
index 0eac5cbb214..e96db07f808 100644
--- a/harvard-cardiff-university.csl
+++ b/harvard-cardiff-university-old.csl
@@ -1,13 +1,11 @@
 <?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-GB">
   <info>
-    <title>Cardiff University - Harvard</title>
-    <id>http://www.zotero.org/styles/harvard-cardiff-university</id>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university" rel="self"/>
-    <link href="https://xerte.cardiff.ac.uk/play_4069" rel="documentation"/>
-    <link href="https://xerte.cardiff.ac.uk/play_4191" rel="documentation"/>
+    <title>Cardiff University - (old) Harvard</title>
+    <id>http://www.zotero.org/styles/harvard-cardiff-university-old</id>
+    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="self"/>
     <link href="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
-    <author>
+      <author>
       <name>Zoe Young</name>
       <email>youngz@cardiff.ac.uk</email>
     </author>
diff --git a/harvard-swinburne-university-of-technology.csl b/harvard-swinburne-university-of-technology.csl
index cba5ed84114..32244dd6ddc 100644
--- a/harvard-swinburne-university-of-technology.csl
+++ b/harvard-swinburne-university-of-technology.csl
@@ -1,12 +1,11 @@
 <?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-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" and="symbol" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Swinburne University of Technology - Harvard</title>
+    <title-short>Swinburne Harvard</title-short>
     <id>http://www.zotero.org/styles/harvard-swinburne-university-of-technology</id>
     <link href="http://www.zotero.org/styles/harvard-swinburne-university-of-technology" rel="self"/>
-    <!--<link href="http://www.lib.monash.edu.au/tutorials/citing/harvard.html" rel="documentation"/>
-    If the same style is used by Monash University, it should get a dependent style pointing to this one -->
-    <link href="http://www.swinburne.edu.au/lib/researchhelp/harvard_system.htm" rel="documentation"/>
+    <link href="https://www.swinburne.edu.au/library/search/referencing-guides/harvard-style-guide/" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
@@ -14,18 +13,37 @@
     <contributor>
       <name>Sebastian Karcher</name>
     </contributor>
+    <contributor>
+      <name>Kiran Castellino</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <summary>The Australian version of the Harvard author-date style</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <summary>The version of the Harvard author-date style used by Swinburne University of Technology, Australia</summary>
+    <updated>2021-08-28T11:17:24+10: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-GB">
     <terms>
+      <term name="accessed">viewed</term>
+      <term name="anonymous" form="short">Anon</term>
+      <term name="edition" form="short">edn</term>
       <term name="editor" form="short">
         <single>ed.</single>
         <multiple>eds</multiple>
       </term>
+      <term name="chapter" form="short">
+        <single>ch.</single>
+        <multiple>chs</multiple>
+      </term>
+      <term name="issue" form="short">
+        <single>no.</single>
+        <multiple>nos</multiple>
+      </term>
+      <term name="section" form="short">
+        <single>s.</single>
+        <multiple>ss.</multiple>
+      </term>
+      <term name="translator" form="verb-short">trans.</term>
     </terms>
   </locale>
   <macro name="editor">
@@ -41,8 +59,13 @@
       </names>
     </group>
   </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+  <macro name="translator">
+    <group delimiter=" ">
+      <text term="translator" form="verb-short"/>
+      <names variable="translator" delimiter=", " suffix=",">
+        <name and="symbol" initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+      </names>
+    </group>
   </macro>
   <macro name="author">
     <names variable="author">
@@ -50,27 +73,26 @@
       <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
-        <text macro="anon"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/>
+      <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with="" name-as-sort-order="all"/>
       <substitute>
         <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="anon"/>
+        <text variable="title" font-style="italic"/>
       </substitute>
     </names>
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
-        <text variable="title" font-style="italic"/>
+      <if variable="container-title">
+        <text variable="title" quotes="true"/>
       </if>
       <else>
-        <text variable="title" quotes="true"/>
+        <text variable="title" font-style="italic"/>
       </else>
     </choose>
   </macro>
@@ -83,9 +105,12 @@
   <macro name="year-date">
     <choose>
       <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <choose>
+          <if is-uncertain-date="issued">
+            <text term="circa" form="short" suffix=" "/>
+          </if>
+        </choose>
+        <date variable="issued" form="text" date-parts="year"/>
       </if>
       <else>
         <text term="no date" form="short"/>
@@ -130,19 +155,19 @@
   <macro name="access">
     <choose>
       <if variable="URL">
-        <text value="viewed"/>
+        <text term="accessed"/>
         <group prefix=" " delimiter=", ">
-          <date variable="accessed" delimiter=" ">
-            <date-part name="day"/>
-            <date-part name="month" suffix=","/>
-            <date-part name="year"/>
-          </date>
+          <date variable="accessed" form="text"/>
           <text variable="URL" prefix="&lt;" suffix="&gt;"/>
         </group>
       </if>
     </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" collapse="year" givenname-disambiguation-rule="by-cite">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="year-date"/>
+    </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
@@ -150,13 +175,13 @@
           <text macro="year-date"/>
         </group>
         <group delimiter=" ">
-          <label variable="locator" plural="never" form="short"/>
+          <label variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true">
+  <bibliography hanging-indent="false">
     <sort>
       <key macro="author"/>
       <key variable="title"/>
@@ -168,10 +193,9 @@
           <text macro="year-date"/>
         </group>
         <text macro="title"/>
-        <group delimiter=" ">
-          <text macro="editor"/>
-          <text variable="container-title" font-style="italic"/>
-        </group>
+        <text macro="translator"/>
+        <text macro="editor"/>
+        <text variable="container-title" font-style="italic"/>
         <text macro="locators-journal"/>
         <text macro="edition"/>
         <text variable="genre"/>
diff --git a/harvard-university-of-kent.csl b/harvard-university-of-kent.csl
index e03e98441ec..a015ab27a69 100644
--- a/harvard-university-of-kent.csl
+++ b/harvard-university-of-kent.csl
@@ -4,7 +4,7 @@
     <title>University of Kent - Harvard</title>
     <id>http://www.zotero.org/styles/harvard-university-of-kent</id>
     <link href="http://www.zotero.org/styles/harvard-university-of-kent" rel="self"/>
-    <link href="http://www.zotero.org/styles/cardiff-university-biosi-and-carbs-harvard" rel="template"/>
+    <link href="http://www.zotero.org/styles/cardiff-university-harvard" rel="template"/>
     <link href="http://www.kent.ac.uk/ai/Harvard-Style-Guide-July-2014.pdf" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
diff --git a/hiob-ludolf-centre-for-ethiopian-studies-long-names.csl b/hiob-ludolf-centre-for-ethiopian-studies-long-names.csl
index d79120b01b0..0a6ff720cc9 100644
--- a/hiob-ludolf-centre-for-ethiopian-studies-long-names.csl
+++ b/hiob-ludolf-centre-for-ethiopian-studies-long-names.csl
@@ -21,7 +21,7 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="humanities"/>
-    <updated>2017-10-02T08:36:15+00:00</updated>
+    <updated>2018-11-30T04:01: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-GB">
@@ -42,13 +42,13 @@
     <terms>
       <term name="available at">siehe</term>
       <term name="editor" form="short">
-        <single>hrsg.</single>
-        <multiple>hrsg.</multiple>
+        <single>Hrsg.</single>
+        <multiple>Hrsg.</multiple>
       </term>
       <term name="translator" form="short">übers.</term>
       <term name="editortranslator" form="short">
-        <single>hrsg., übers.</single>
-        <multiple>hrsg., übers.</multiple>
+        <single>Hrsg., Übers.</single>
+        <multiple>Hrsg., Übers.</multiple>
       </term>
     </terms>
   </locale>
@@ -148,9 +148,12 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill book graphic legal_case legislation manuscript motion_picture report song speech webpage thesis" match="any">
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech webpage" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
+      <else-if type="thesis manuscript" match="any">
+        <text variable="title" font-style="italic" suffix=","/>
+      </else-if>
       <else>
         <text variable="title" strip-periods="false" quotes="true" suffix=","/>
       </else>
@@ -270,15 +273,22 @@
         </group>
         <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=")"/>
       </if>
-      <else-if type="article-newspaper article-magazine" match="any">
+      <else-if type="article-magazine" match="any">
         <group delimiter="/">
           <text variable="volume"/>
           <text variable="issue"/>
         </group>
         <date form="text" date-parts="year-month-day" variable="issued"/>
       </else-if>
+      <else-if type="article-newspaper" match="any">
+        <group delimiter="/">
+          <text variable="volume"/>
+          <text variable="issue"/>
+        </group>
+        <date form="text" date-parts="year-month-day" variable="issued" prefix="(" suffix=")"/>
+      </else-if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+        <group prefix=" " suffix="" delimiter=", ">
           <text macro="edition"/>
         </group>
       </else-if>
@@ -299,6 +309,16 @@
       </choose>
     </group>
   </macro>
+  <macro name="exlocators">
+    <choose>
+      <if type="article-newspaper">
+        <text macro="locators" prefix=" "/>
+      </if>
+      <else>
+        <text macro="locators" prefix=", "/>
+      </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" givenname-disambiguation-rule="by-cite" collapse="year">
     <sort>
       <key macro="author"/>
@@ -357,15 +377,36 @@
             <text macro="container-phrase"/>
           </group>
           <group>
+            <choose>
+              <if type="entry-encyclopedia chapter" match="any">
+                <text value=""/>
+              </if>
+              <else-if type="paper-conference" match="any">
+                <group prefix=", ">
+                  <number variable="volume"/>
+                </group>
+              </else-if>
+              <else-if type="article article-magazine article-newspaper" match="none">
+                <text value=","/>
+              </else-if>
+              <else>
+                <group prefix=", ">
+                  <number variable="volume" form="ordinal"/>
+                </group>
+              </else>
+            </choose>
             <text macro="container-contributors"/>
             <text macro="secondary-contributors"/>
           </group>
           <group>
             <text variable="container-title" font-style="italic" prefix=" "/>
             <choose>
-              <if type="article article-journal article-magazine article-newspaper" match="any">
+              <if type="article article-journal article-magazine" match="any">
                 <text value=","/>
               </if>
+              <else-if type="article-newspaper" match="any">
+                <text value=" "/>
+              </else-if>
               <else-if type="paper-conference" match="any">
                 <group prefix=", ">
                   <number variable="volume"/>
@@ -382,7 +423,7 @@
             <text variable="collection-title"/>
             <number variable="collection-number"/>
           </group>
-          <text macro="locators" prefix=", "/>
+          <text macro="exlocators"/>
         </group>
         <group delimiter=", " prefix=" ">
           <text macro="event"/>
diff --git a/hiob-ludolf-centre-for-ethiopian-studies-with-url-doi.csl b/hiob-ludolf-centre-for-ethiopian-studies-with-url-doi.csl
index c942b088bbd..bf1a4fb4fb5 100644
--- a/hiob-ludolf-centre-for-ethiopian-studies-with-url-doi.csl
+++ b/hiob-ludolf-centre-for-ethiopian-studies-with-url-doi.csl
@@ -20,7 +20,7 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="humanities"/>
-    <updated>2017-10-02T08:36:15+00:00</updated>
+    <updated>2018-11-30T04:01: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-GB">
@@ -41,13 +41,13 @@
     <terms>
       <term name="available at">siehe</term>
       <term name="editor" form="short">
-        <single>hrsg.</single>
-        <multiple>hrsg.</multiple>
+        <single>Hrsg.</single>
+        <multiple>Hrsg.</multiple>
       </term>
       <term name="translator" form="short">übers.</term>
       <term name="editortranslator" form="short">
-        <single>hrsg., übers.</single>
-        <multiple>hrsg., übers.</multiple>
+        <single>Hrsg., Übers.</single>
+        <multiple>Hrsg., Übers.</multiple>
       </term>
     </terms>
   </locale>
@@ -154,9 +154,12 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill book graphic legal_case legislation manuscript motion_picture report song speech webpage thesis" match="any">
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech webpage" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
+      <else-if type="thesis manuscript" match="any">
+        <text variable="title" font-style="italic" suffix=","/>
+      </else-if>
       <else>
         <text variable="title" strip-periods="false" quotes="true" suffix=","/>
       </else>
@@ -276,15 +279,22 @@
         </group>
         <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=")"/>
       </if>
-      <else-if type="article-newspaper article-magazine" match="any">
+      <else-if type="article-magazine" match="any">
         <group delimiter="/">
           <text variable="volume"/>
           <text variable="issue"/>
         </group>
         <date form="text" date-parts="year-month-day" variable="issued"/>
       </else-if>
+      <else-if type="article-newspaper" match="any">
+        <group delimiter="/">
+          <text variable="volume"/>
+          <text variable="issue"/>
+        </group>
+        <date form="text" date-parts="year-month-day" variable="issued" prefix="(" suffix=")"/>
+      </else-if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+        <group prefix=" " suffix="" delimiter=", ">
           <text macro="edition"/>
         </group>
       </else-if>
@@ -305,6 +315,16 @@
       </choose>
     </group>
   </macro>
+  <macro name="exlocators">
+    <choose>
+      <if type="article-newspaper">
+        <text macro="locators" prefix=" "/>
+      </if>
+      <else>
+        <text macro="locators" prefix=", "/>
+      </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" givenname-disambiguation-rule="by-cite" collapse="year">
     <sort>
       <key macro="author"/>
@@ -363,15 +383,36 @@
             <text macro="container-phrase"/>
           </group>
           <group>
+            <choose>
+              <if type="entry-encyclopedia chapter" match="any">
+                <text value=""/>
+              </if>
+              <else-if type="paper-conference" match="any">
+                <group prefix=", ">
+                  <number variable="volume"/>
+                </group>
+              </else-if>
+              <else-if type="article article-magazine article-newspaper" match="none">
+                <text value=","/>
+              </else-if>
+              <else>
+                <group prefix=", ">
+                  <number variable="volume" form="ordinal"/>
+                </group>
+              </else>
+            </choose>
             <text macro="container-contributors"/>
             <text macro="secondary-contributors"/>
           </group>
           <group>
             <text variable="container-title" font-style="italic" prefix=" "/>
             <choose>
-              <if type="article article-journal article-magazine article-newspaper" match="any">
+              <if type="article article-journal article-magazine" match="any">
                 <text value=","/>
               </if>
+              <else-if type="article-newspaper" match="any">
+                <text value=" "/>
+              </else-if>
               <else-if type="paper-conference" match="any">
                 <group prefix=", ">
                   <number variable="volume"/>
@@ -388,7 +429,7 @@
             <text variable="collection-title"/>
             <number variable="collection-number"/>
           </group>
-          <text macro="locators" prefix=", "/>
+          <text macro="exlocators"/>
         </group>
         <group delimiter=", " prefix=" ">
           <text macro="event"/>
diff --git a/hiob-ludolf-centre-for-ethiopian-studies.csl b/hiob-ludolf-centre-for-ethiopian-studies.csl
index 05f1096f6da..c3c5c36cfff 100644
--- a/hiob-ludolf-centre-for-ethiopian-studies.csl
+++ b/hiob-ludolf-centre-for-ethiopian-studies.csl
@@ -20,7 +20,7 @@
     </contributor>
     <category citation-format="author-date"/>
     <category field="humanities"/>
-    <updated>2017-10-02T08:36:15+00:00</updated>
+    <updated>2021-09-22T12:29:15+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-GB">
@@ -41,13 +41,13 @@
     <terms>
       <term name="available at">siehe</term>
       <term name="editor" form="short">
-        <single>hrsg.</single>
-        <multiple>hrsg.</multiple>
+        <single>Hrsg.</single>
+        <multiple>Hrsg.</multiple>
       </term>
       <term name="translator" form="short">übers.</term>
       <term name="editortranslator" form="short">
-        <single>hrsg., übers.</single>
-        <multiple>hrsg., übers.</multiple>
+        <single>Hrsg., Übers.</single>
+        <multiple>Hrsg., Übers.</multiple>
       </term>
     </terms>
   </locale>
@@ -147,9 +147,12 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill book graphic legal_case legislation manuscript motion_picture report song speech webpage thesis" match="any">
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech webpage" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
+      <else-if type="thesis manuscript" match="any">
+        <text variable="title" font-style="italic" suffix=","/>
+      </else-if>
       <else>
         <text variable="title" strip-periods="false" quotes="true" suffix=","/>
       </else>
@@ -269,15 +272,22 @@
         </group>
         <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=")"/>
       </if>
-      <else-if type="article-newspaper article-magazine" match="any">
+      <else-if type="article-magazine" match="any">
         <group delimiter="/">
           <text variable="volume"/>
           <text variable="issue"/>
         </group>
         <date form="text" date-parts="year-month-day" variable="issued"/>
       </else-if>
+      <else-if type="article-newspaper" match="any">
+        <group delimiter="/">
+          <text variable="volume"/>
+          <text variable="issue"/>
+        </group>
+        <date form="text" date-parts="year-month-day" variable="issued" prefix="(" suffix=")"/>
+      </else-if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
+        <group prefix=" " suffix="" delimiter=", ">
           <text macro="edition"/>
         </group>
       </else-if>
@@ -285,7 +295,6 @@
   </macro>
   <macro name="citation-locator">
     <group>
-      <label variable="locator" form="short"/>
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
@@ -298,6 +307,16 @@
       </choose>
     </group>
   </macro>
+  <macro name="exlocators">
+    <choose>
+      <if type="article-newspaper">
+        <text macro="locators" prefix=" "/>
+      </if>
+      <else>
+        <text macro="locators" prefix=", "/>
+      </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" givenname-disambiguation-rule="by-cite" collapse="year">
     <sort>
       <key macro="author"/>
@@ -356,15 +375,36 @@
             <text macro="container-phrase"/>
           </group>
           <group>
+            <choose>
+              <if type="entry-encyclopedia chapter" match="any">
+                <text value=""/>
+              </if>
+              <else-if type="paper-conference" match="any">
+                <group prefix=", ">
+                  <number variable="volume"/>
+                </group>
+              </else-if>
+              <else-if type="article article-magazine article-newspaper" match="none">
+                <text value=","/>
+              </else-if>
+              <else>
+                <group prefix=", ">
+                  <number variable="volume" form="ordinal"/>
+                </group>
+              </else>
+            </choose>
             <text macro="container-contributors"/>
             <text macro="secondary-contributors"/>
           </group>
           <group>
             <text variable="container-title" font-style="italic" prefix=" "/>
             <choose>
-              <if type="article article-journal article-magazine article-newspaper" match="any">
+              <if type="article article-journal article-magazine" match="any">
                 <text value=","/>
               </if>
+              <else-if type="article-newspaper" match="any">
+                <text value=" "/>
+              </else-if>
               <else-if type="paper-conference" match="any">
                 <group prefix=", ">
                   <number variable="volume"/>
@@ -381,7 +421,7 @@
             <text variable="collection-title"/>
             <number variable="collection-number"/>
           </group>
-          <text macro="locators" prefix=", "/>
+          <text macro="exlocators"/>
         </group>
         <group delimiter=", " prefix=" ">
           <text macro="event"/>
diff --git a/human-molecular-genetics.csl b/human-molecular-genetics.csl
new file mode 100644
index 00000000000..66fb816caf1
--- /dev/null
+++ b/human-molecular-genetics.csl
@@ -0,0 +1,195 @@
+<?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>Human Molecular Genetics</title>
+    <title-short>HMG</title-short>
+    <id>http://www.zotero.org/styles/human-molecular-genetics</id>
+    <link href="http://www.zotero.org/styles/human-molecular-genetics" rel="self"/>
+    <link href="http://www.zotero.org/styles/database" rel="template"/>
+    <link href="http://www.oxfordjournals.org/our_journals/hmg/for_authors/general.html" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0964-6906</issn>
+    <eissn>1460-2083</eissn>
+    <updated>2019-07-26T21:58:08+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">
+      <name delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" text-case="capitalize-first"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="series">
+    <text variable="collection-title"/>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="book-container">
+    <group delimiter=" ">
+      <text term="in" text-case="capitalize-first"/>
+      <text macro="editor"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=") "/>
+  </macro>
+  <macro name="full-issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="month" form="long" suffix=" "/>
+      <date-part name="day" suffix=", "/>
+      <date-part name="year"/>
+    </date>
+  </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="," prefix="(" suffix=")">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="11" et-al-use-first="10" second-field-align="flush" entry-spacing="0">
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <text macro="author" suffix=" "/>
+      <text macro="issued"/>
+      <text variable="title" suffix=". "/>
+      <choose>
+        <if type="article-magazine">
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic" suffix="."/>
+            <text macro="edition"/>
+            <text macro="publisher"/>
+            <text macro="full-issued" suffix=","/>
+            <text macro="pages"/>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="genre"/>
+            </group>
+            <text macro="publisher"/>
+            <text macro="volume"/>
+            <text macro="pages"/>
+          </group>
+        </else-if>
+        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter="; ">
+            <text variable="title" font-style="italic"/>
+            <text macro="editor" prefix=" "/>
+            <text macro="series"/>
+            <text macro="edition"/>
+            <choose>
+              <if type="report">
+                <group delimiter=" ">
+                  <text variable="genre"/>
+                  <text variable="number"/>
+                </group>
+              </if>
+            </choose>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="issued"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="volume"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <text variable="number"/>
+            </group>
+            <date variable="issued" form="text"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=", ">
+            <text macro="book-container"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="series"/>
+            <text macro="publisher"/>
+            <group delimiter=", ">
+              <text macro="volume"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="webpage post post-weblog" match="any">
+          <group delimiter=" ">
+            <text variable="title"/>
+            <text variable="URL"/>
+            <date variable="accessed" prefix="(accessed " suffix=")" delimiter=" ">
+              <date-part name="month" form="short" strip-periods="true"/>
+              <date-part name="day" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </else-if>
+        <else-if type="article-journal">
+          <group delimiter=", ">
+            <text variable="container-title" font-style="italic" form="short"/>
+            <text variable="volume" font-weight="bold"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <text variable="container-title" font-style="italic" form="short"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="issued" font-weight="bold"/>
+              <text variable="volume" font-style="italic"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/renamed-styles.json b/renamed-styles.json
index 1b3131a1857..d5396d84489 100644
--- a/renamed-styles.json
+++ b/renamed-styles.json
@@ -63,6 +63,7 @@
     "canadian-medical-association-journal": "cmaj",
     "canadian-veterinary-journal": "the-canadian-veterinary-journal",
     "cancer-epidemiology-biomarkers-prevention": "cancer-epidemiology-biomarkers-and-prevention",
+    "cardiff-university-biosi-and-carbs-harvard": "cardiff-university-harvard",
     "cardiovascular-pharmacology-and-therapeutics": "journal-of-cardiovascular-pharmacology-and-therapeutics",
     "catalysts-and-catalysed-reactions": "royal-society-of-chemistry",
     "central-african-journal-of-medicine": "the-central-african-journal-of-medicine",
@@ -294,7 +295,7 @@
     "graefes-archive-and-experimental-ophthalmology": "graefes-archive-for-clinical-and-experimental-ophthalmology",
     "gruppendynamik-und-organisationsberatung": "gruppe-interaktion-organisation-zeitschrift-fur-angewandte-organisationspsychologie",
     "harvard-anglia-ruskin": "harvard-anglia-ruskin-university",
-    "harvard-cardiff-university-biosi": "cardiff-university-biosi-and-carbs-harvard",
+    "harvard-cardiff-university-biosi": "cardiff-university-harvard",
     "harvard-de-montfort-university": "de-montfort-university-harvard",
     "harvard-oxford-brookes-university": "harvard-cite-them-right",
     "harvard-sheffield": "harvard-the-university-of-sheffield-town-and-regional-planning",
diff --git a/society-of-biblical-literature-fullnote-bibliography.csl b/society-of-biblical-literature-fullnote-bibliography.csl
index c909b194293..8907c73113b 100644
--- a/society-of-biblical-literature-fullnote-bibliography.csl
+++ b/society-of-biblical-literature-fullnote-bibliography.csl
@@ -32,7 +32,7 @@
     <category citation-format="note"/>
     <category field="theology"/>
     <summary>Society of Biblical Literature format with full notes and bibliography</summary>
-    <updated>2021-05-10T14:27:36+00:00</updated>
+    <updated>2021-05-16T18:39:17+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-US">
@@ -81,6 +81,19 @@
       <text macro="editor-translator-verb-short-comma"/>
     </group>
   </macro>
+  <macro name="container-author-reviewed-author-and-editor-translator-short">
+    <group delimiter=", ">
+      <choose>
+        <if variable="container-author reviewed-author" match="any">
+          <names variable="container-author reviewed-author" delimiter=", ">
+            <label form="verb-short" suffix=" "/>
+            <name form="short" and="text" delimiter=", "/>
+          </names>
+        </if>
+      </choose>
+      <text macro="editor-translator-verb-short-comma"/>
+    </group>
+  </macro>
   <macro name="secondary-contributors-note">
     <choose>
       <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
@@ -88,6 +101,13 @@
       </if>
     </choose>
   </macro>
+  <macro name="secondary-contributors-short">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+        <text macro="container-author-reviewed-author-and-editor-translator-short"/>
+      </if>
+    </choose>
+  </macro>
   <macro name="container-contributors-note">
     <choose>
       <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
@@ -275,6 +295,19 @@
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </else-if>
+      <else-if variable="reviewed-author">
+        <choose>
+          <if variable="reviewed-title" match="any">
+            <group delimiter=", review of ">
+              <text variable="title" quotes="true" text-case="title"/>
+              <text variable="reviewed-title" font-style="italic" text-case="title"/>
+            </group>
+          </if>
+          <else>
+            <text variable="title" font-style="italic" prefix="review of " text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
       <else>
         <text variable="title" quotes="true" text-case="title"/>
       </else>
@@ -292,6 +325,25 @@
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
       </else-if>
+      <else-if variable="reviewed-author">
+        <group delimiter=", ">
+          <choose>
+            <if variable="reviewed-title" match="any">
+              <group delimiter=", review of ">
+                <text variable="title" quotes="true" text-case="title"/>
+                <text variable="reviewed-title" font-style="italic" text-case="title"/>
+              </group>
+            </if>
+            <else>
+              <text variable="title" font-style="italic" prefix="Review of " text-case="title"/>
+            </else>
+          </choose>
+          <names variable="reviewed-author">
+            <label form="verb-short" text-case="lowercase" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </else-if>
       <else>
         <text variable="title" quotes="true" text-case="title"/>
       </else>
@@ -315,6 +367,19 @@
       <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
         <text variable="title" form="short" font-style="italic" text-case="title"/>
       </else-if>
+      <else-if variable="reviewed-author">
+        <choose>
+          <if variable="reviewed-title" match="any">
+            <group delimiter=", review of ">
+              <text variable="title" quotes="true" text-case="title"/>
+              <text variable="reviewed-title" font-style="italic" text-case="title"/>
+            </group>
+          </if>
+          <else>
+            <text variable="title" font-style="italic" prefix="review of " text-case="title"/>
+          </else>
+        </choose>
+      </else-if>
       <else>
         <text variable="title" form="short" quotes="true" text-case="title"/>
       </else>
@@ -684,8 +749,8 @@
                   </if>
                   <else>
                     <group delimiter=" ">
-                        <label variable="locator" form="short"/>
-                        <text variable="locator"/>
+                      <label variable="locator" form="short"/>
+                      <text variable="locator"/>
                     </group>
                   </else>
                 </choose>
@@ -970,7 +1035,10 @@
         <else-if position="subsequent">
           <group delimiter=", ">
             <text macro="contributors-short"/>
-            <text macro="title-short"/>
+            <group>
+              <text macro="title-short"/>
+              <text macro="secondary-contributors-short" prefix=" (" suffix=")"/>
+            </group>
             <text macro="disambiguate-chapter"/>
             <text macro="point-locators-subsequent"/>
           </group>
@@ -1010,7 +1078,7 @@
   <bibliography hanging-indent="true" et-al-min="10" et-al-use-first="9" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
     <sort>
       <key macro="contributors-sort"/>
-      <key variable="title"/>
+      <key macro="title"/>
       <key variable="genre"/>
     </sort>
     <layout suffix=".">
diff --git a/the-journal-of-hellenic-studies.csl b/the-journal-of-hellenic-studies.csl
index bf2884c4427..9ce9f5531ba 100644
--- a/the-journal-of-hellenic-studies.csl
+++ b/the-journal-of-hellenic-studies.csl
@@ -4,7 +4,7 @@
     <title>The Journal of Hellenic Studies</title>
     <id>http://www.zotero.org/styles/the-journal-of-hellenic-studies</id>
     <link href="http://www.zotero.org/styles/the-journal-of-hellenic-studies" rel="self"/>
-    <link href="http://www.zotero.org/styles/harvard-cardiff-university" rel="template"/>
+    <link href="http://www.zotero.org/styles/harvard-cardiff-university-old" rel="template"/>
     <link href="http://www.hellenicsociety.org.uk/publications/" rel="documentation"/>
     <author>
       <name>Polly Low</name>
diff --git a/unesco-international-institute-for-educational-planning.csl b/unesco-international-institute-for-educational-planning.csl
new file mode 100644
index 00000000000..2cb8bfa3704
--- /dev/null
+++ b/unesco-international-institute-for-educational-planning.csl
@@ -0,0 +1,307 @@
+<?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">
+  <info>
+    <title>UNESCO International Institute for Educational Planning</title>
+    <title-short>UNESCO IIEP</title-short>
+    <id>http://www.zotero.org/styles/unesco-international-institute-for-educational-planning</id>
+    <link href="http://www.zotero.org/styles/unesco-international-institute-for-educational-planning" rel="self"/>
+    <link href="http://www.zotero.org/styles/human-resource-management-journal" rel="template"/>
+    <link href="https://box.iiep.unesco.org/s/od697NSMAiocAKX" rel="documentation"/>
+    <link href="https://box.iiep.unesco.org/s/nPi9co5n2LEf43f" rel="documentation"/>
+    <author>
+      <name>Sebastian Karcher</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <summary>Citation style for all publications from UNESCO's International Institute for Educational Planning; tested in English and French</summary>
+    <updated>2017-07-03T03:48:18+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">
+    <style-options punctuation-in-quote="false"/>
+    <date form="text">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="open-quote">‘</term>
+      <term name="close-quote">’</term>
+      <term name="open-inner-quote">“</term>
+      <term name="close-inner-quote">”</term>
+      <term name="accessed">last accessed</term>
+      <term name="no date" form="short">n.d.</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+    </terms>
+  </locale>
+  <locale xml:lang="fr">
+    <terms>
+      <term name="in">dans</term>
+      <term name="accessed">Accès le</term>
+      <term name="no date" form="short">s.d.</term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="page" form="short">
+        <single>p.</single>
+        <multiple>pp.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="secondary-contributors">
+    <names variable="editor translator" delimiter=", ">
+      <name and="text" initialize-with="." delimiter=", "/>
+      <label form="short" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter="; " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="always"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else>
+        <choose>
+          <if type="report" match="any">
+            <text variable="URL"/>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text term="accessed" text-case="capitalize-first"/>
+              <date variable="accessed" form="text" suffix=":"/>
+              <text variable="URL"/>
+            </group>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group delimiter=". ">
+          <choose>
+            <if type="report" match="any">
+              <text variable="genre"/>
+            </if>
+          </choose>
+          <text variable="title" font-style="italic" text-case="title"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text variable="title" quotes="true"/>
+          <choose>
+            <if type="webpage post-weblog" match="any">
+              <text variable="container-title"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </if>
+      <else-if type="speech">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <choose>
+              <if variable="genre">
+                <group delimiter=" ">
+                  <text term="presented at"/>
+                  <text variable="event"/>
+                </group>
+              </if>
+              <else>
+                <group delimiter=" ">
+                  <text term="presented at" text-case="capitalize-first"/>
+                  <text variable="event"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+          <text variable="event-place"/>
+          <date variable="issued">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month"/>
+          </date>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text variable="genre"/>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </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>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal" match="any">
+        <group delimiter=", " prefix=", ">
+          <group>
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-magazine article-newspaper" match="any">
+        <date variable="issued" prefix=", ">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month"/>
+        </date>
+      </else-if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition"/>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+        </group>
+        <group prefix=" (" suffix=")">
+          <label variable="page" form="short" suffix=" "/>
+          <text variable="page"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="webpage post-weblog" match="none">
+        <text variable="container-title" font-style="italic" text-case="title"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page" match="none">
+          <label variable="locator" form="short"/>
+        </if>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="series">
+    <group delimiter=", ">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=": ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
+          <text macro="issued-year"/>
+        </group>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="0">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="issued-year"/>
+        <group delimiter=". ">
+          <text macro="title"/>
+          <group>
+            <choose>
+              <if type="chapter paper-conference article-journal" match="any">
+                <text term="in" text-case="capitalize-first" suffix=": "/>
+              </if>
+            </choose>
+            <group delimiter=", ">
+              <text macro="secondary-contributors"/>
+              <text macro="container-title"/>
+            </group>
+            <text macro="locators"/>
+          </group>
+        </group>
+        <group delimiter=". ">
+          <text macro="series"/>
+          <text macro="publisher"/>
+          <text macro="access"/>
+        </group>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl b/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
index 5835ad5f06d..a94d029dea5 100644
--- a/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
+++ b/universite-du-quebec-a-montreal-etudes-litteraires-et-semiologie.csl
@@ -397,7 +397,7 @@
     </choose>
   </macro>
   <macro name="locator">
-    <group delimiter=" " prefix=", " suffix=".">
+    <group delimiter="&#160;" prefix=", " suffix=".">
       <choose>
         <if type="thesis" match="all" locator="page">
           <text value="f."/>
@@ -450,7 +450,10 @@
   <macro name="page-chapter">
     <choose>
       <if match="none" locator="page">
-        <text variable="page" prefix="p. "/>
+        <group delimiter="&#160;">
+          <label variable="page" form="short"/>
+          <text variable="page"/>
+        </group>
       </if>
     </choose>
   </macro>
diff --git a/urad-rs-za-makroekonomske-analize-in-razvoj.csl b/urad-rs-za-makroekonomske-analize-in-razvoj.csl
index f51a6d27bed..52383679764 100644
--- a/urad-rs-za-makroekonomske-analize-in-razvoj.csl
+++ b/urad-rs-za-makroekonomske-analize-in-razvoj.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="never" page-range-format="expanded" default-locale="sl-SL">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded" default-locale="sl-SI">
   <info>
     <title>Urad RS za makroekonomske analize in razvoj (Slovenščina)</title>
     <title-short>UMAR</title-short>
@@ -13,7 +13,7 @@
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
-    <updated>2021-09-02T13:59:07+00:00</updated>
+    <updated>2021-09-22T16:14:55+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">
@@ -205,7 +205,7 @@
             <names variable="composer"/>
             <names variable="director">
               <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-              <label form="long" prefix=" (" suffix=")" text-case="title"/>
+              <label form="long" prefix=" (" suffix=")" text-case="lowercase"/>
             </names>
             <choose>
               <if variable="container-title">
@@ -219,21 +219,21 @@
                 </choose>
                 <names variable="translator">
                   <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-                  <label form="short" prefix=" (" suffix=")" text-case="title"/>
+                  <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
                 </names>
               </if>
             </choose>
             <names variable="editor translator" delimiter=", ">
               <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+              <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
             </names>
             <names variable="editorial-director">
               <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+              <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
             </names>
             <names variable="collection-editor">
               <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-              <label form="short" prefix=" (" suffix=")" text-case="title"/>
+              <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
             </names>
             <choose>
               <if type="report">
@@ -671,30 +671,51 @@
       </if>
       <else>
         <group delimiter=", ">
-          <text variable="genre" text-case="capitalize-first"/>
+          <text variable="genre" text-case="lowercase"/>
           <text variable="medium" text-case="capitalize-first"/>
         </group>
       </else>
     </choose>
   </macro>
   <macro name="title-and-descriptions">
-    <group delimiter=", ">
-      <text macro="title"/>
-      <choose>
-        <if variable="title interviewer" type="interview" match="any">
-          <group delimiter=" ">
-            <text macro="description"/>
-            <text macro="format"/>
-          </group>
-        </if>
-        <else>
-          <group delimiter=" ">
-            <text macro="format"/>
-            <text macro="description"/>
-          </group>
-        </else>
-      </choose>
-    </group>
+    <choose>
+      <if type="report">
+        <choose>
+          <if variable="number page" match="none">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <text macro="format"/>
+            </group>
+          </if>
+          <else>
+          <group delimiter=", ">
+              <text macro="title"/>
+              <text macro="format"/>
+              <text macro="description"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text macro="title"/>
+          <choose>
+            <if variable="title interviewer" type="interview" match="any">
+              <group delimiter=" ">
+                <text macro="description"/>
+                <text macro="format"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=" ">
+                <text macro="format"/>
+                <text macro="description"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </else>
+    </choose>
   </macro>
   <macro name="archive">
     <group delimiter=". ">
@@ -996,8 +1017,15 @@
       <if type="article-journal article-magazine figure review review-book" match="any">
         <group delimiter=", ">
           <group>
-            <text variable="volume" font-style="italic"/>
-            <text variable="issue" prefix="(" suffix=")"/>
+            <choose>
+              <if variable="volume" match="none">
+                <text variable="issue"/>
+              </if>
+              <else>
+                <text variable="volume" font-style="italic"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </else>
+            </choose>
           </group>
           <text variable="page"/>
         </group>