diff --git a/aerosol-science-and-technology.csl b/aerosol-science-and-technology.csl
index 3e9db45c4ed..505b98ea8c3 100644
--- a/aerosol-science-and-technology.csl
+++ b/aerosol-science-and-technology.csl
@@ -8,12 +8,11 @@
     <link href="http://www.tandfonline.com/action/authorSubmission?journalCode=uast20&amp;page=instructions" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
-      <email>obrienpat86@gmail.com</email>
     </author>
     <category citation-format="author-date"/>
     <category field="chemistry"/>
     <issn>0278-6826</issn>
-    <updated>2017-03-29T13:20:23+00:00</updated>
+    <updated>2020-07-09T20:19: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>
   </info>
   <macro name="author">
@@ -88,7 +87,7 @@
         <text variable="container-title" form="short"/>
       </else-if>
       <else>
-        <group delimiter=", " prefix=" " suffix=",">
+        <group delimiter=", " prefix=" ">
           <text variable="container-title" form="short"/>
           <text variable="collection-title"/>
         </group>
@@ -97,7 +96,7 @@
   </macro>
   <macro name="access">
     <choose>
-      <if type="webpage">
+      <if type="webpage post post-weblog" match="any">
         <group delimiter=" ">
           <text term="available at" text-case="capitalize-first"/>
           <text variable="URL"/>
@@ -111,6 +110,9 @@
           </group>
         </group>
       </if>
+      <else-if type="article-journal" match="any">
+        <text variable="DOI" prefix="doi:"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="publisher">
@@ -156,7 +158,7 @@
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group delimiter=":" prefix=" ">
-          <group>
+          <group delimiter=" ">
             <text variable="volume"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
@@ -205,7 +207,7 @@
       <key macro="author"/>
       <key macro="issued" sort="descending"/>
     </sort>
-    <layout>
+    <layout suffix=".">
       <group suffix=".">
         <text macro="author" suffix=""/>
         <text macro="issued" prefix=" (" suffix=")"/>
diff --git a/apa-annotated-bibliography.csl b/apa-annotated-bibliography.csl
index dcdfbfa6391..fc8408bc01a 100644
--- a/apa-annotated-bibliography.csl
+++ b/apa-annotated-bibliography.csl
@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">
diff --git a/apa-cv.csl b/apa-cv.csl
index ede70ee0ebe..a04e8b77942 100644
--- a/apa-cv.csl
+++ b/apa-cv.csl
@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">
diff --git a/apa-no-ampersand.csl b/apa-no-ampersand.csl
index 458f4c03bd7..4743fc42f36 100644
--- a/apa-no-ampersand.csl
+++ b/apa-no-ampersand.csl
@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">
diff --git a/apa-single-spaced.csl b/apa-single-spaced.csl
index d0bc51e6b17..0b5a864b3aa 100644
--- a/apa-single-spaced.csl
+++ b/apa-single-spaced.csl
@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">
diff --git a/apa-with-abstract.csl b/apa-with-abstract.csl
index 95ce313693c..491f4463c81 100644
--- a/apa-with-abstract.csl
+++ b/apa-with-abstract.csl
@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">
diff --git a/apa.csl b/apa.csl
index f37038d59d4..a5841ca76f9 100644
--- a/apa.csl
+++ b/apa.csl
@@ -190,14 +190,14 @@
   </locale>
   <locale xml:lang="la">
     <terms>
-      <term name="letter"></term>
+      <term name="letter"/>
       <term name="letter" form="short">epistula</term>
     </terms>
   </locale>
   <locale xml:lang="lt">
     <terms>
       <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"></term>
+      <term name="letter" form="short"/>
     </terms>
   </locale>
   <locale xml:lang="lv">
diff --git a/australian-guide-to-legal-citation.csl b/australian-guide-to-legal-citation.csl
index d496f687490..fd268cb2eae 100644
--- a/australian-guide-to-legal-citation.csl
+++ b/australian-guide-to-legal-citation.csl
@@ -14,7 +14,7 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Support for the development of the CSL style was provided by the Faculty of Law, University of Technology Sydney. The AGLC is published by the University of Melbourne Faculty of Law.</summary>
-    <updated>2018-09-03T17:14:48+00:00</updated>
+    <updated>2020-07-09T03:49: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>
   <locale>
@@ -398,17 +398,14 @@
           </choose>
           <choose>
             <if type="article-newspaper">
-              <group delimiter=" ">
+              <group delimiter=", ">
+                <text variable="publisher-place"/>
                 <choose>
                   <if variable="URL">
                     <text term="online"/>
-                    <text term="at"/>
                   </if>
                 </choose>
-                <group delimiter=", ">
-                  <text variable="publisher-place"/>
-                  <text macro="issued-full"/>
-                </group>
+                <text macro="issued-full"/>
               </group>
             </if>
             <else-if type="legislation bill" match="any">
diff --git a/common-market-law-review.csl b/common-market-law-review.csl
new file mode 100644
index 00000000000..eff15fb8240
--- /dev/null
+++ b/common-market-law-review.csl
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" default-locale="en-GB">
+  <info>
+    <title>Common Market Law Review</title>
+    <title-short>CMLR</title-short>
+    <id>http://www.zotero.org/styles/common-market-law-review</id>
+    <link href="http://www.zotero.org/styles/common-market-law-review" rel="self"/>
+    <link href="http://www.zotero.org/styles/austrian-legal" rel="template"/>
+    <link href="https://kluwerlawonline.com/Journals/Common+Market+Law+Review/2" rel="documentation"/>
+    <link href="http://wolterskluwerblogs.com/authors/wp-content/uploads/sites/60/2020/03/Author-Guidelines-Journals_COLA_HOUSERULES2019.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <issn>0165-0750</issn>
+    <eissn>1875-8320</eissn>
+    <updated>2020-07-14T14:50:52+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="accessed">last visited</term>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+    </terms>
+  </locale>
+  <macro name="edition">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <group delimiter=" ">
+            <number variable="edition" form="ordinal"/>
+            <label variable="edition" form="short"/>
+          </group>
+        </if>
+        <else>
+          <text variable="edition" suffix="."/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="authors">
+    <names variable="author">
+      <name form="short" and="text" initialize-with="." name-as-sort-order="all"/>
+      <et-al term="et-al" font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text term="anonymous"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editors">
+    <names variable="editor" font-style="normal">
+      <name form="short" and="text" initialize-with="." name-as-sort-order="all"/>
+      <et-al term="et-al" font-style="italic"/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="citation-locator">
+    <choose>
+      <if match="any" locator="page">
+        <group delimiter=" ">
+          <text term="at"/>
+          <text variable="locator"/>
+        </group>
+      </if>
+      <else>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator" prefix=" "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " prefix="(" suffix=")">
+      <text variable="publisher"/>
+      <date variable="issued">
+        <date-part name="year" form="long"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="pages">
+    <group delimiter=" ">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" givenname-disambiguation-rule="all-names-with-initials" disambiguate-add-givenname="true">
+    <layout suffix="." delimiter="; ">
+      <group delimiter=", ">
+        <choose>
+          <if position="ibid-with-locator ibid" match="any">
+            <text term="ibid"/>
+          </if>
+          <else>
+            <choose>
+              <if type="legal_case">
+                <choose>
+                  <if variable="authority issued number" match="all">
+                    <text variable="authority" suffix=" "/>
+                    <date variable="issued" suffix=" ">
+                      <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+                      <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+                      <date-part name="year" form="long" suffix=","/>
+                    </date>
+                    <text variable="number"/>
+                  </if>
+                  <else>
+                    <text variable="title"/>
+                  </else>
+                </choose>
+              </if>
+              <else-if type="bill">
+                <choose>
+                  <if variable="container-title section" match="all">
+                    <text variable="section" suffix=" "/>
+                    <text variable="container-title"/>
+                    <choose>
+                      <if position="first">
+                        <choose>
+                          <if variable="references">
+                            <text variable="references" prefix=" "/>
+                          </if>
+                        </choose>
+                      </if>
+                    </choose>
+                  </if>
+                  <else>
+                    <text variable="title"/>
+                  </else>
+                </choose>
+              </else-if>
+              <else-if type="article-journal">
+                <group delimiter=", ">
+                  <text macro="authors"/>
+                  <text variable="title" quotes="true"/>
+                  <group delimiter=" ">
+                    <text variable="volume"/>
+                    <text variable="container-title" font-style="italic" suffix=" "/>
+                    <date variable="issued" prefix="(" suffix=")">
+                      <date-part name="year" form="long"/>
+                    </date>
+                  </group>
+                  <text variable="page"/>
+                </group>
+              </else-if>
+              <else-if type="book">
+                <group delimiter=" ">
+                  <group delimiter=", ">
+                    <text macro="authors" font-style="normal"/>
+                    <text variable="title" font-style="italic"/>
+                    <text macro="edition" vertical-align="baseline"/>
+                    <text variable="volume"/>
+                    <text variable="collection-title"/>
+                  </group>
+                  <text macro="publisher"/>
+                </group>
+              </else-if>
+              <else-if type="chapter">
+                <group delimiter=", ">
+                  <text macro="authors" font-style="normal"/>
+                  <group delimiter=" ">
+                    <text variable="title" quotes="true"/>
+                    <text term="in"/>
+                    <text macro="editors"/>
+                  </group>
+                  <group delimiter=" ">
+                    <group>
+                      <text variable="container-title" font-style="italic"/>
+                      <text macro="edition"/>
+                    </group>
+                    <text macro="publisher"/>
+                  </group>
+                  <text macro="pages"/>
+                </group>
+              </else-if>
+              <else-if type="thesis">
+                <text macro="authors" suffix=", "/>
+                <text variable="title"/>
+                <choose>
+                  <if position="first">
+                    <text variable="genre" prefix=". "/>
+                    <text variable="publisher" prefix=", "/>
+                    <date variable="issued" prefix=" (" suffix=")">
+                      <date-part name="year" form="long"/>
+                    </date>
+                  </if>
+                </choose>
+                <text variable="locator" prefix=" "/>
+              </else-if>
+              <else-if type="webpage post post-weblog" match="any">
+                <group delimiter=", ">
+                  <text macro="authors"/>
+                  <text variable="title"/>
+                  <group delimiter=", ">
+                    <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+                    <group delimiter=" " prefix="(" suffix=")">
+                      <text term="accessed"/>
+                      <date form="text" variable="issued"/>
+                    </group>
+                  </group>
+                </group>
+              </else-if>
+              <else>
+                <group delimiter=", ">
+                  <text macro="authors" font-style="italic"/>
+                  <text variable="title"/>
+                  <choose>
+                    <if variable="container-title">
+                      <text variable="container-title"/>
+                    </if>
+                  </choose>
+                  <date form="numeric" variable="issued"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </else>
+            </choose>
+          </else>
+        </choose>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+</style>
diff --git a/dependent/prifysgol-caerdydd-harvard.csl b/dependent/prifysgol-caerdydd-harvard.csl
new file mode 100644
index 00000000000..116ae9e5759
--- /dev/null
+++ b/dependent/prifysgol-caerdydd-harvard.csl
@@ -0,0 +1,24 @@
+<?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 (Welsh)</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="https://github.com/citation-style-language/styles/pull/3676#issuecomment-420542651" rel="documentation"/>
+    <author>
+      <name>Zoe Young</name>
+      <email>youngz@cardiff.ac.uk</email>
+    </author>
+    <author>
+      <name>Lewys Peters</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>The Harvard author-date style - adapted for Cardiff University</summary>
+    <updated>2020-07-14T08:48:51+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/deutsche-gesellschaft-fur-psychologie.csl b/deutsche-gesellschaft-fur-psychologie.csl
index 8ead25b4ba0..54316874276 100644
--- a/deutsche-gesellschaft-fur-psychologie.csl
+++ b/deutsche-gesellschaft-fur-psychologie.csl
@@ -123,7 +123,7 @@
           <group delimiter=" ">
             <text term="issue" form="short"/>
             <text variable="number"/>
-        </group>
+          </group>
         </group>
       </if>
       <else-if type="bill book graphic legislation motion_picture report song" match="any">
diff --git a/epidemiology-and-infection.csl b/epidemiology-and-infection.csl
index 68ca2a9d7d7..83eac10b9ee 100644
--- a/epidemiology-and-infection.csl
+++ b/epidemiology-and-infection.csl
@@ -5,7 +5,7 @@
     <id>http://www.zotero.org/styles/epidemiology-and-infection</id>
     <link href="http://www.zotero.org/styles/epidemiology-and-infection" rel="self"/>
     <link href="http://www.zotero.org/styles/journal-of-thrombosis-and-haemostasis" rel="template"/>
-    <link href="https://www.cambridge.org/core/journals/epidemiology-and-infection/information/instructions-contributors#" rel="documentation"/>
+    <link href="https://www.cambridge.org/core/journals/epidemiology-and-infection/information/instructions-contributors#references" rel="documentation"/>
     <author>
       <name>Patrick O'Brien</name>
       <email>obrienpat86@gmail.com</email>
diff --git a/geographische-zeitschrift.csl b/geographische-zeitschrift.csl
new file mode 100644
index 00000000000..4fd7284821e
--- /dev/null
+++ b/geographische-zeitschrift.csl
@@ -0,0 +1,289 @@
+<?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">
+  <!-- Polyglot; journal publishes in German and English -->
+  <info>
+    <title>Geographische Zeitschrift</title>
+    <id>http://www.zotero.org/styles/geographische-zeitschrift</id>
+    <link href="http://www.zotero.org/styles/geographische-zeitschrift" rel="self"/>
+    <link href="http://www.zotero.org/styles/suburban-zeitschrift-fur-kritische-stadtforschung" rel="template"/>
+    <link href="http://www.steiner-verlag.de/uploads/media/2019-08_MB_Zitierrichtlinien_GZ_engl.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien, PhD</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="geography"/>
+    <issn>0016-7479</issn>
+    <eissn>2365-3124</eissn>
+    <updated>2020-07-01T08:57: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="de">
+    <terms>
+      <term name="accessed">letzter Zugriff</term>
+      <term name="presented at">Paper präsentiert bei der</term>
+      <term name="anonymous" form="long">Ohne Verfasser</term>
+      <term name="anonymous" form="short">O.V.</term>
+    </terms>
+  </locale>
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group delimiter=", ">
+          <group delimiter=": ">
+            <text term="in" text-case="capitalize-first"/>
+            <names variable="editor translator" delimiter=", ">
+              <name delimiter-precedes-last="always" et-al-min="3" et-al-use-first="1" initialize-with="." name-as-sort-order="all"/>
+              <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
+            </names>
+          </group>
+          <group delimiter=", " suffix=". ">
+            <text variable="container-title" text-case="title"/>
+            <text variable="collection-title" text-case="title"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="book graphic legal_case motion_picture report song" match="any">
+        <group delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </else-if>
+      <else-if type="article-journal article-magazine article" match="any">
+        <group delimiter=" ">
+          <group delimiter=": ">
+            <text term="in" text-case="capitalize-first"/>
+            <group delimiter=", ">
+              <text variable="container-title"/>
+              <text variable="collection-title"/>
+            </group>
+          </group>
+          <group delimiter=", ">
+            <group delimiter="/">
+              <text variable="volume"/>
+              <text variable="issue"/>
+            </group>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=" ">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="volume"/>
+              <group delimiter="/">
+                <text variable="number"/>
+                <date date-parts="year" form="numeric" variable="issued"/>
+              </group>
+            </group>
+            <text variable="page"/>
+          </group>
+          <group delimiter=" ">
+            <text value="in der Fassung"/>
+            <text variable="references"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper" match="any">
+        <group delimiter=", ">
+          <group delimiter=": ">
+            <text term="in"/>
+            <text variable="container-title"/>
+          </group>
+          <date variable="issued">
+            <date-part name="day"/>
+            <date-part name="month" form="numeric" prefix="."/>
+            <date-part name="year" prefix="."/>
+          </date>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", ">
+          <text variable="container-title"/>
+          <text variable="collection-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" initialize-with="." name-as-sort-order="all" sort-separator=", "/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" delimiter="/" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <group>
+          <text term="anonymous" form="short"/>
+        </group>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage post post-weblog" match="any">
+        <group delimiter=" ">
+          <text variable="URL"/>
+          <date variable="accessed" prefix="(" suffix=")">
+            <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+            <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report" match="any">
+        <text variable="title"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="genre"/>
+          <text variable="number" prefix="Nr. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song speech" match="any">
+        <group delimiter=". ">
+          <text variable="title"/>
+          <text variable="medium"/>
+          <text macro="edition"/>
+        </group>
+      </else-if>
+      <else-if type="webpage">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" text-case="capitalize-first" suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <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">
+    <group delimiter=" ">
+      <choose>
+        <if is-numeric="edition">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </if>
+        <else>
+          <text variable="edition"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group delimiter=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+      </if>
+      <else-if type="chapter paper-conference" match="any">
+        <group delimiter=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+          <text macro="pages"/>
+        </group>
+      </else-if>
+      <else-if type="patent">
+        <text variable="number"/>
+      </else-if>
+      <else-if type="thesis" match="any">
+        <group delimiter=". ">
+          <text macro="publisher"/>
+          <text variable="genre"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
+  <macro name="author-year-title">
+    <group delimiter=": ">
+      <group delimiter=" ">
+        <text macro="author"/>
+        <group prefix="(" suffix=")">
+          <text macro="issued"/>
+          <date date-parts="year" form="text" variable="original-date" prefix="[" suffix="]"/>
+        </group>
+      </group>
+      <text macro="title"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" collapse="year">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <choose>
+            <if type="legislation" match="any">
+              <text variable="title-short"/>
+            </if>
+            <else>
+              <text macro="author-short"/>
+            </else>
+          </choose>
+          <text macro="issued"/>
+        </group>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="3" et-al-use-first="1" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued" sort="descending"/>
+      <key macro="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author-year-title"/>
+        <group>
+          <text macro="container"/>
+          <text macro="locators"/>
+        </group>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/gewerblicher-rechtsschutz-und-urheberrecht.csl b/gewerblicher-rechtsschutz-und-urheberrecht.csl
index 60d4f380e85..f672fb47a0c 100644
--- a/gewerblicher-rechtsschutz-und-urheberrecht.csl
+++ b/gewerblicher-rechtsschutz-und-urheberrecht.csl
@@ -126,7 +126,7 @@
           <text macro="autor-editor-note" suffix=", "/>
           <choose>
             <if match="none" position="first">
-              <group delimiter=" " prefix="(" suffix="), ">
+              <group delimiter=" " prefix="(" suffix=")">
                 <text value="o. Fn."/>
                 <text variable="first-reference-note-number"/>
               </group>
@@ -159,7 +159,7 @@
               <text macro="author-commentary" suffix=", "/>
               <choose>
                 <if match="none" position="first">
-                  <group delimiter=" " prefix="(" suffix="), ">
+                  <group delimiter=" " prefix="(" suffix=")">
                     <text value="o. Fn."/>
                     <text variable="first-reference-note-number"/>
                   </group>
diff --git a/harvard-institut-fur-praxisforschung-de.csl b/harvard-institut-fur-praxisforschung-de.csl
index 49b125634f7..4addff2d2d3 100644
--- a/harvard-institut-fur-praxisforschung-de.csl
+++ b/harvard-institut-fur-praxisforschung-de.csl
@@ -13,27 +13,28 @@
       narrow no break space: uni202F / &#8239; - but this is not supported widely!
       em dash: &#8212;
       -->
-    <contributor>
+    <author>
       <name>Saskia Mestern</name>
       <email>saskia.mestern@gmail.com</email>
-    </contributor>
+    </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <category field="political_science"/>
     <category field="social_science"/>
     <summary>A Harvard author-date style variant as used for Political Science and others, mostly German. The in-text citation style is changed to [author year: page], avoiding the abbreviation for pages (S.) and changing the delimiters.</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <updated>2020-07-13T09:24: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>
   <locale xml:lang="de">
     <terms>
       <term name="anonymous" form="short">o. A.</term>
       <term name="no date" form="short">o. J.</term>
+      <term name="volume" form="short">Jg.</term>
     </terms>
   </locale>
   <macro name="editor">
     <names variable="editor" delimiter="; ">
-      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long"/>
+      <name and="text"/>
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
@@ -65,25 +66,17 @@
       <if variable="DOI">
         <text variable="DOI" prefix="doi: "/>
       </if>
-      <else>
-        <choose>
-          <if type="webpage">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text value="am" suffix=" "/>
-              <date variable="accessed">
-                <date-part name="day" form="numeric-leading-zeros" suffix="."/>
-                <date-part name="month" form="numeric-leading-zeros" suffix="."/>
-                <date-part name="year" form="long"/>
-              </date>
-              <group>
-                <text term="from" prefix=" " suffix=" "/>
-                <text variable="URL"/>
-              </group>
-            </group>
-          </if>
-        </choose>
-      </else>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=" ">
+          <text term="online" prefix="[" suffix="]"/>
+          <text variable="URL"/>
+          <date variable="accessed" prefix="[" suffix="]">
+            <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+            <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+            <date-part name="year" form="long"/>
+          </date>
+        </group>
+      </else-if>
     </choose>
   </macro>
   <macro name="title">
@@ -92,7 +85,7 @@
         <text variable="title" font-style="italic"/>
       </if>
       <else>
-        <text variable="title" prefix="„" suffix="“"/>
+        <text variable="title"/>
       </else>
     </choose>
   </macro>
@@ -101,7 +94,6 @@
       <if type="report thesis" match="any">
         <group prefix=" (" suffix=")">
           <text variable="genre"/>
-          <!--<text term="number" form="short" suffix=" "/>-->
           <text variable="number" prefix=" Nr. "/>
         </group>
       </if>
@@ -119,20 +111,27 @@
         <date variable="issued">
           <date-part name="year"/>
         </date>
+        <text variable="year-suffix"/>
       </if>
       <else>
         <text term="no date" form="short"/>
+        <text variable="year-suffix"/>
       </else>
     </choose>
   </macro>
   <macro name="locator">
     <choose>
       <if type="article-journal">
-        <text variable="volume" suffix=" "/>
-        <!-- <date variable="issued">
-          <date-part name="year" prefix="(" suffix=")"/>
-          </date>-->
-        <text variable="issue" prefix="(" suffix=")"/>
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <label text-case="capitalize-first" variable="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="issue" form="short"/>
+            <text variable="issue"/>
+          </group>
+        </group>
       </if>
     </choose>
   </macro>
@@ -163,9 +162,9 @@
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
-        <group>
-          <number variable="edition" form="numeric" suffix=". "/>
-          <text term="edition" form="short"/>
+        <group delimiter=". ">
+          <number variable="edition" form="numeric"/>
+          <text term="edition"/>
         </group>
       </if>
       <else>
@@ -176,7 +175,7 @@
   <macro name="container-prefix">
     <choose>
       <if type="chapter paper-conference article-journal" match="any">
-        <text term="in" text-case="capitalize-first" suffix=":"/>
+        <text term="in" suffix=":"/>
       </if>
     </choose>
   </macro>
@@ -215,14 +214,14 @@
           </else>
         </choose>
         <text macro="year-date" prefix="(" suffix="):"/>
-        <text macro="title" suffix="."/>
+        <text macro="title" suffix=","/>
         <text macro="container-prefix"/>
         <choose>
           <if type="chapter paper-conference" match="any">
-            <text macro="editor"/>
+            <text macro="editor" suffix=","/>
           </if>
         </choose>
-        <text variable="container-title" font-style="italic" suffix="."/>
+        <text variable="container-title" font-style="italic" suffix=","/>
         <text macro="edition"/>
         <text macro="genre"/>
         <text macro="publisher"/>
@@ -233,7 +232,6 @@
           <text macro="locator"/>
           <text macro="published-date"/>
           <text macro="pages"/>
-          <!--<text macro="duration"/>-->
           <text macro="access"/>
         </group>
       </group>
diff --git a/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl b/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl
index 59efddef356..18fbb1c1588 100644
--- a/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl
+++ b/instituto-de-investigaciones-sobre-la-universidad-y-la-educacion-moderno.csl
@@ -377,7 +377,7 @@
           <group>
             <text macro="title" strip-periods="false" quotes="true" prefix=" "/>
             <choose>
-              <if variable="container-title" match="none"></if>
+              <if variable="container-title" match="none"/>
             </choose>
           </group>
           <group prefix=", " delimiter=", ">
@@ -390,7 +390,7 @@
             <text macro="locators"/>
           </group>
           <choose>
-            <if variable="container-title"></if>
+            <if variable="container-title"/>
           </choose>
           <group prefix=", " delimiter=", ">
             <text macro="editor"/>
diff --git a/kunstakademie-munster.csl b/kunstakademie-munster.csl
new file mode 100644
index 00000000000..58f6c92299d
--- /dev/null
+++ b/kunstakademie-munster.csl
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" demote-non-dropping-particle="sort-only" default-locale="de-DE">
+  <!-- ====== KOPFTEIL ================================-->
+  <info>
+    <title>Kunstakademie Münster (German)</title>
+    <id>http://www.zotero.org/styles/kunstakademie-munster</id>
+    <link href="http://www.zotero.org/styles/kunstakademie-munster" rel="self"/>
+    <link href="http://www.zotero.org/styles/theologie-und-philosophie" rel="template"/>
+    <link href="https://www.kunstakademie-muenster.de/fileadmin/media/pdf/Studienordnungen/Allgemeine_Unterlagen/Infomappe_Leitfaden_wissenschaftliches_Arbeiten_201900605.pdf" rel="documentation"/>
+    <author>
+      <name>Malte Frey</name>
+      <email>freymalte AT gmail DOT com</email>
+    </author>
+    <category citation-format="note"/>
+    <summary>A German citation style used in art history and art sciences according to the standards of Academy of Fine Arts Münster. Deutschsprachiger Zitationsstil für Kunstwissenschaften nach Vorgaben der Kunstakademie Münster.</summary>
+    <updated>2020-06-29T16:22:30+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <!-- ====== DEUTSCHE FORMEN ======================= -->
+  <locale xml:lang="de">
+    <terms>
+      <term name="accessed">Zugriff am </term>
+      <term name="editor" form="short">
+        <single>(Hg.)</single>
+        <multiple>(Hgg.)</multiple>
+      </term>
+      <term name="editortranslator" form="verb-short">hg. und übers. von</term>
+      <term name="reviewed-author">Rezension zu</term>
+      <term name="et-al">et al.</term>
+    </terms>
+  </locale>
+  <!-- ====== MAKROS =============================== -->
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " delimiter=" / " font-variant="small-caps"/>
+      <et-al font-variant="normal"/>
+      <label form="short" prefix=" "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" delimiter=" / "/>
+      <et-al font-style="normal"/>
+      <label form="short" prefix=" "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor-transl-long">
+    <names variable="editor translator" delimiter=", ">
+      <label form="verb" suffix=" "/>
+      <name form="long" delimiter-precedes-last="never" and="text"/>
+      <et-al font-style="normal"/>
+    </names>
+  </macro>
+  <macro name="translator-long">
+    <names variable="translator">
+      <label form="verb" suffix=" "/>
+      <name form="long" delimiter-precedes-last="never" and="text"/>
+      <et-al font-style="normal"/>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="chapter article-journal article-newspaper article-magazine entry-encyclopedia webpage">
+        <text variable="title" quotes="true"/>
+      </if>
+      <else-if variable="reviewed-author">
+        <text term="reviewed-author" suffix=" "/>
+        <names variable="reviewed-author" suffix=", ">
+          <name form="long" delimiter=" / "/>
+        </names>
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="accessed">
+    <text term="accessed"/>
+    <date variable="accessed">
+      <date-part form="numeric-leading-zeros" name="day" suffix="."/>
+      <date-part form="numeric-leading-zeros" name="month" suffix="."/>
+      <date-part form="long" name="year"/>
+    </date>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+          <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+          <date-part name="year" form="long"/>
+        </date>
+      </if>
+      <else>
+        <date variable="accessed">
+          <date-part name="day" form="numeric-leading-zeros" suffix="."/>
+          <date-part name="month" form="numeric-leading-zeros" suffix="."/>
+          <date-part name="year" form="long"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year" range-delimiter="-"/>
+    </date>
+  </macro>
+  <macro name="volume">
+    <choose>
+      <if is-numeric="volume">
+        <group delimiter=" ">
+          <label variable="volume" form="short"/>
+          <text variable="volume"/>
+        </group>
+      </if>
+      <else>
+        <text variable="volume"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- ====== ZITATE =============================== -->
+  <citation et-al-min="2" et-al-use-first="1">
+    <layout suffix="." delimiter="; ">
+      <text macro="author-short" suffix=" "/>
+      <text macro="year-date" suffix=" "/>
+    </layout>
+  </citation>
+  <!-- ====== LITERATURVERZEICHNIS (Titel für Rezension) ============ -->
+  <bibliography et-al-min="4" et-al-use-first="1" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+      <key variable="volume"/>
+      <key macro="date"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author" suffix=", "/>
+      <choose>
+        <if type="book">
+          <text macro="title" font-style="italic"/>
+          <!-- italic titel allgemein-->
+        </if>
+        <else-if type="thesis">
+          <text macro="title" font-style="italic"/>
+        </else-if>
+        <else-if type="entry-encyclopedia" match="any">
+          <text macro="title" prefix="(Art.) "/>
+        </else-if>
+        <else>
+          <text macro="title"/>
+        </else>
+      </choose>
+      <choose>
+        <if type="webpage">
+          <text variable="container-title" prefix=", in: "/>
+          <text macro="date" prefix=" (" suffix=")"/>
+          <text variable="URL" prefix=", online verfügbar unter: "/>
+          <text macro="accessed" prefix=" (" suffix=")"/>
+        </if>
+        <else-if type="thesis" match="any">
+          <text variable="genre" prefix=", "/>
+          <text variable="publisher-place" prefix=", "/>
+          <text variable="publisher" prefix=", "/>
+          <text macro="date" prefix=", "/>
+        </else-if>
+        <else-if type="speech" match="any">
+          <group prefix=". ">
+            <text variable="genre" suffix=" in "/>
+            <text variable="publisher-place"/>
+          </group>
+          <text macro="date" prefix=", "/>
+        </else-if>
+        <else-if type="manuscript">
+          <text macro="translator-long" prefix=", "/>
+          <text variable="genre" prefix=". "/>
+          <text variable="publisher-place" prefix=", "/>
+          <text variable="publisher" prefix=": " suffix=" "/>
+          <text macro="date" prefix=", "/>
+          <group delimiter=": " prefix=" (" suffix=")">
+            <text variable="archive"/>
+            <text variable="archive_location"/>
+          </group>
+        </else-if>
+        <else-if type=" entry-encyclopedia" match="any">
+          <text term="in" prefix=", " suffix=": "/>
+          <names variable="editor" suffix=", ">
+            <name form="long" delimiter=" / " font-variant="small-caps"/>
+            <label form="short" prefix=" "/>
+          </names>
+          <text variable="container-title" font-style="italic" form="long"/>
+          <!-- Italic Magazine und Lexika-->
+          <text variable="edition" vertical-align="sup"/>
+          <text variable="volume" prefix=" "/>
+          <text variable="publisher-place" prefix=", "/>
+          <text macro="year-date" prefix=" "/>
+          <text variable="page" prefix=", S. "/>
+          <text variable="URL" prefix=", online verfügbar unter: "/>
+          <text macro="accessed" prefix=" (" suffix=")"/>
+        </else-if>
+        <else-if type="article-newspaper article-magazine article-journal" match="any">
+          <text term="in" prefix=", " suffix=": "/>
+          <text variable="container-title" font-style="italic"/>
+          <!-- Italic Magazine und Lexika-->
+          <text variable="publisher-place" prefix=" (" suffix=")"/>
+          <text variable="volume" prefix=" "/>
+          <text variable="issue" prefix=", "/>
+          <text macro="date" prefix=" (" suffix=")"/>
+          <text variable="section" prefix=", "/>
+          <text variable="page" prefix=", S. "/>
+        </else-if>
+        <else-if type="chapter" match="any">
+          <text macro="translator-long" prefix=" (" suffix=")"/>
+          <text term="in" prefix=", " suffix=": "/>
+          <names variable="editor" suffix=", ">
+            <name form="long" delimiter=" / " font-variant="small-caps"/>
+            <label form="short" prefix=" "/>
+          </names>
+          <text variable="container-title" font-style="italic"/>
+          <!-- Italic für Kapitel in Sammelbänden -->
+          <group delimiter="; " prefix=" (" suffix=")">
+            <text variable="collection-title"/>
+            <text variable="collection-number" prefix="Band "/>
+          </group>
+          <text macro="volume" prefix="; "/>
+          <text variable="publisher-place" prefix=", "/>
+          <!--         <text variable="publisher" prefix=": "/> -->
+          <text value=" "/>
+          <text variable="edition" vertical-align="sup"/>
+          <text macro="year-date"/>
+          <text variable="page" prefix=", S. "/>
+        </else-if>
+        <else>
+          <text macro="editor-transl-long" prefix="; "/>
+          <text macro="volume" prefix="; "/>
+          <group delimiter="; " prefix=" (" suffix=")">
+            <text variable="collection-title"/>
+            <text variable="collection-number" prefix="Band "/>
+          </group>
+          <text variable="publisher-place" prefix=", "/>
+          <!--          <text variable="publisher" prefix=": "/>	 -->
+          <!-- Verlag raus -->
+          <text value=" "/>
+          <text variable="edition" vertical-align="sup"/>
+          <text macro="year-date"/>
+          <text variable="note" prefix=" "/>
+          <text variable="number-of-pages" prefix=", " suffix=" S."/>
+          <text variable="ISBN" prefix=", ISBN "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/society-of-biblical-literature-author-date.csl b/society-of-biblical-literature-author-date.csl
index 86b33d5a11a..14a5d8efcf2 100644
--- a/society-of-biblical-literature-author-date.csl
+++ b/society-of-biblical-literature-author-date.csl
@@ -30,7 +30,7 @@
     </terms>
   </locale>
   <macro name="editor-translator-verb-period">
-    <names variable="editor translator" delimiter=" ">
+    <names variable="editor translator" delimiter=". ">
       <label form="verb" text-case="capitalize-first" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
@@ -481,7 +481,7 @@
       <text macro="point-locators"/>
     </group>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" after-collapse-delimiter="; ">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <group delimiter=" ">
diff --git a/society-of-biblical-literature-fullnote-bibliography.csl b/society-of-biblical-literature-fullnote-bibliography.csl
index 9b042ac0548..339f85a8bbf 100644
--- a/society-of-biblical-literature-fullnote-bibliography.csl
+++ b/society-of-biblical-literature-fullnote-bibliography.csl
@@ -48,7 +48,7 @@
     </names>
   </macro>
   <macro name="editor-translator-verb-period">
-    <names variable="editor translator" delimiter=" ">
+    <names variable="editor translator" delimiter=". ">
       <label form="verb" text-case="capitalize-first" suffix=" "/>
       <name and="text" delimiter=", "/>
     </names>
diff --git a/thieme-german.csl b/thieme-german.csl
index c1a0fa6ee7d..44a43023588 100644
--- a/thieme-german.csl
+++ b/thieme-german.csl
@@ -1,6 +1,6 @@
 <?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="de-DE">
-  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" demote-non-dropping-particle="sort-only" class="in-text" page-range-format="expanded" default-locale="de-DE">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Thieme-German (German)</title>
     <id>http://www.zotero.org/styles/thieme-german</id>
@@ -24,22 +24,19 @@
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <summary>Modified version of the "Vancouver Bracket" for Thieme Journals</summary>
-    <updated>2017-05-18T15:23:08+00:00</updated>
+    <updated>2020-06-30T08:44:34+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" suffix=". ">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <names variable="editor"/>
-      </substitute>
+    <names suffix=". " variable="author">
+      <name sort-separator=" " name-as-sort-order="all" initialize-with="" et-al-use-first="3" et-al-min="4" delimiter-precedes-last="always"/>
+      <label prefix=" (" form="short" suffix=")"/>
     </names>
   </macro>
   <macro name="editor">
-    <names variable="editor" suffix=". ">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" suffix=")"/>
+    <names suffix=". " variable="editor">
+      <name sort-separator=" " name-as-sort-order="all" initialize-with="" delimiter-precedes-last="always" delimiter=", "/>
+      <label prefix=" (" form="short" suffix=")"/>
     </names>
   </macro>
   <macro name="publisher">
@@ -62,7 +59,7 @@
     </group>
   </macro>
   <macro name="journal-title">
-    <text variable="container-title" form="short" strip-periods="true"/>
+    <text form="short" variable="container-title" strip-periods="true"/>
   </macro>
   <macro name="title">
     <text variable="title"/>
@@ -71,12 +68,12 @@
     <choose>
       <if is-numeric="edition">
         <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
+          <number form="ordinal" variable="edition"/>
+          <text form="short" term="edition"/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix="."/>
+        <text suffix="." variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -89,8 +86,8 @@
     </layout>
   </citation>
   <bibliography second-field-align="flush">
-    <layout>
-      <text variable="citation-number" vertical-align="sup"/>
+    <layout vertical-align="baseline" font-variant="normal">
+      <text prefix="[" suffix="]" variable="citation-number" strip-periods="false" vertical-align="baseline" quotes="false" text-case="title"/>
       <text macro="author"/>
       <text macro="title" suffix=". "/>
       <choose>
@@ -102,22 +99,22 @@
         </if>
         <else-if type="chapter paper-conference" match="any">
           <group prefix=" " suffix=".">
-            <text term="in" suffix=": " text-case="capitalize-first"/>
+            <text suffix=": " term="in" text-case="capitalize-first"/>
             <text macro="editor"/>
             <text variable="container-title"/>
           </group>
-          <text macro="publisher" prefix=" "/>
-          <text variable="page" prefix=": "/>
+          <text prefix=" " macro="publisher"/>
+          <text prefix=": " variable="page"/>
         </else-if>
         <else>
           <group delimiter=" ">
             <text macro="journal-title"/>
-            <date variable="issued" suffix=";">
+            <date suffix=";" variable="issued">
               <date-part name="year"/>
             </date>
             <text variable="volume"/>
           </group>
-          <text variable="page" prefix=": "/>
+          <text prefix=": " variable="page"/>
         </else>
       </choose>
       <text macro="access"/>
diff --git a/tijdschrift-voor-geneeskunde.csl b/tijdschrift-voor-geneeskunde.csl
new file mode 100644
index 00000000000..8eed8da65dc
--- /dev/null
+++ b/tijdschrift-voor-geneeskunde.csl
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" et-al-min="6" et-al-use-first="3" page-range-format="minimal" demote-non-dropping-particle="sort-only" default-locale="nl-NL">
+  <info>
+    <title>Tijdschrift voor Geneeskunde (Dutch)</title>
+    <title-short>TvG</title-short>
+    <id>http://www.zotero.org/styles/tijdschrift-voor-geneeskunde</id>
+    <link href="http://www.zotero.org/styles/tijdschrift-voor-geneeskunde" rel="self"/>
+    <link href="http://www.zotero.org/styles/vancouver" rel="template"/>
+    <link href="https://www.tvg.be/index.php/richtlijnen-auteurs" rel="documentation"/>
+    <author>
+      <name>Sander Dumont</name>
+      <uri>https://www.mendeley.com/profiles/sander-dumont</uri>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0371-683X</issn>
+    <eissn>1784-9721</eissn>
+    <updated>2020-07-08T16: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="nl-NL">
+    <terms>
+      <term name="et-al">et al</term>
+      <term name="and others" form="verb">et al</term>
+      <term name="and others" form="short">et al</term>
+      <term name="and others" form="verb-short">et al</term>
+      <term name="and others" form="symbol">et al</term>
+    </terms>
+  </locale>
+  <locale xml:lang="en">
+    <date form="text" delimiter=" ">
+      <date-part name="year"/>
+      <date-part name="month" form="short" strip-periods="true"/>
+      <date-part name="day"/>
+    </date>
+    <terms>
+      <term name="collection-editor" form="long">
+        <single>editor</single>
+        <multiple>editors</multiple>
+      </term>
+      <term name="presented at">presented at</term>
+      <term name="available at">available from</term>
+      <term name="section" form="short">sect.</term>
+    </terms>
+  </locale>
+  <locale xml:lang="fr">
+    <date form="text" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month" form="short" strip-periods="true"/>
+      <date-part name="year"/>
+    </date>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter-precedes-last="always" et-al-min="6" et-al-use-first="3" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" suffix=".">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="chapter-marker">
+    <choose>
+      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+        <text term="in" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="none">
+        <group delimiter=": " suffix=";">
+          <choose>
+            <if type="thesis">
+              <text variable="publisher-place" prefix="[" suffix="]"/>
+            </if>
+            <else-if type="speech"/>
+            <else>
+              <text variable="publisher-place"/>
+            </else>
+          </choose>
+          <text variable="publisher"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage" match="all">
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
+      </if>
+      <else-if type="article-journal" match="any">
+        <text variable="DOI" prefix="doi:"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if type="webpage">
+        <group prefix="[" suffix="]" delimiter=" ">
+          <text term="cited" text-case="lowercase"/>
+          <date variable="accessed" form="text"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper review review-book entry-dictionary entry-encyclopedia" match="any">
+        <group suffix="." delimiter=" ">
+          <choose>
+            <if type="article-journal review review-book" match="any">
+              <text variable="container-title" form="short" strip-periods="true"/>
+            </if>
+            <else>
+              <text variable="container-title" strip-periods="true"/>
+            </else>
+          </choose>
+          <choose>
+            <if type="webpage">
+              <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+            </if>
+          </choose>
+        </group>
+        <text macro="edition" prefix=" "/>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <group delimiter=". ">
+            <text variable="container-title"/>
+            <group delimiter=" ">
+              <text term="section" form="short" text-case="capitalize-first"/>
+              <text variable="section"/>
+            </group>
+          </group>
+          <text variable="number"/>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter=": " suffix=";">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text term="presented at"/>
+          </group>
+          <text variable="event"/>
+        </group>
+      </else-if>
+      <else>
+        <group delimiter=", " suffix=".">
+          <choose>
+            <if variable="collection-title" match="none">
+              <group delimiter=" ">
+                <label variable="volume" form="short" text-case="capitalize-first"/>
+                <text variable="volume"/>
+              </group>
+            </if>
+          </choose>
+          <text variable="container-title"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+    <choose>
+      <if type="article-journal article-magazine chapter paper-conference article-newspaper review review-book entry-dictionary entry-encyclopedia" match="none">
+        <choose>
+          <if variable="URL">
+            <text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          </if>
+        </choose>
+        <text macro="edition" prefix=". "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="thesis">
+        <text variable="genre" prefix=" [" suffix="]"/>
+      </if>
+    </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="date">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="any">
+        <group suffix=";" delimiter=" ">
+          <date variable="issued" form="text"/>
+          <text macro="accessed-date"/>
+        </group>
+      </if>
+      <else-if type="bill legislation" match="any">
+        <group delimiter=", ">
+          <date variable="issued" delimiter=" ">
+            <date-part name="month" form="short" strip-periods="true"/>
+            <date-part name="day"/>
+          </date>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="report">
+        <date variable="issued" delimiter=" ">
+          <date-part name="year"/>
+          <date-part name="month" form="short" strip-periods="true"/>
+        </date>
+        <text macro="accessed-date" prefix=" "/>
+      </else-if>
+      <else-if type="patent">
+        <group suffix=".">
+          <group delimiter=", ">
+            <text variable="number"/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <group delimiter="; ">
+          <group delimiter=" ">
+            <date variable="issued" delimiter=" ">
+              <date-part name="year"/>
+              <date-part name="month" form="short" strip-periods="true"/>
+              <date-part name="day"/>
+            </date>
+            <text macro="accessed-date"/>
+          </group>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else>
+        <group suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text macro="accessed-date" prefix=" "/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="any">
+        <text variable="page" prefix=":"/>
+      </if>
+      <else-if type="book" match="any">
+        <text variable="number-of-pages" prefix=" "/>
+        <choose>
+          <if is-numeric="number-of-pages">
+            <label variable="number-of-pages" form="short" prefix=" " plural="never"/>
+          </if>
+        </choose>
+      </else-if>
+      <else>
+        <group prefix=" " delimiter=" ">
+          <label variable="page" form="short" plural="never"/>
+          <text variable="page"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="journal-location">
+    <choose>
+      <if type="article-journal article-magazine review review-book" match="any">
+        <text variable="volume"/>
+        <text variable="issue" prefix="(" suffix=")"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-details">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="none">
+        <choose>
+          <if variable="collection-title">
+            <group delimiter=" " prefix="(" suffix=")">
+              <names variable="collection-editor" suffix=".">
+                <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+                <label form="long" prefix=", "/>
+              </names>
+              <group delimiter="; ">
+                <text variable="collection-title"/>
+                <group delimiter=" ">
+                  <label variable="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+              </group>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="report-details">
+    <choose>
+      <if type="report">
+        <text variable="number" prefix="Report No.: "/>
+      </if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <group delimiter=". " suffix=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+      </group>
+      <group delimiter=" " suffix=". ">
+        <group delimiter=": ">
+          <text macro="chapter-marker"/>
+          <group delimiter=" ">
+            <text macro="editor"/>
+            <text macro="container-title"/>
+          </group>
+        </group>
+        <text macro="publisher"/>
+        <group>
+          <text macro="date"/>
+          <text macro="journal-location"/>
+          <text macro="pages"/>
+        </group>
+      </group>
+      <text macro="collection-details" suffix=". "/>
+      <text macro="report-details" suffix=". "/>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/universite-de-montreal-apa.csl b/universite-de-montreal-apa.csl
index d1872670ef2..8c2f5654e0b 100644
--- a/universite-de-montreal-apa.csl
+++ b/universite-de-montreal-apa.csl
@@ -25,8 +25,8 @@
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>Adaptation en français canadien des normes de citation de l'APA (6e édition) basée sur le guide des Bibliothèques de l'Université de Montréal.</summary>
-    <updated>2019-08-14T05:14:01+00:00</updated>
+    <summary>Adaptation en français canadien des normes de citation de l'APA (7e édition) basée sur le guide des Bibliothèques de l'Université de Montréal.</summary>
+    <updated>2020-07-10T04:04:36+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>
@@ -64,24 +64,55 @@
     </choose>
   </macro>
   <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
-      <et-al font-style="italic"/>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+    <choose>
+      <if variable="author">
+        <names variable="author">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+          <et-al font-style="italic"/>
+          <label form="short" prefix=" (" suffix=")"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <choose>
+              <if type="report">
+                <text variable="publisher"/>
+                <text macro="title"/>
+              </if>
+              <else>
+                <text macro="title"/>
+              </else>
+            </choose>
+          </substitute>
+        </names>
+      </if>
+      <else>
         <choose>
-          <if type="report">
-            <text variable="publisher"/>
+          <if type="entry-encyclopedia entry-dictionary" match="any">
             <text macro="title"/>
           </if>
           <else>
-            <text macro="title"/>
+            <names variable="author">
+              <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+              <et-al font-style="italic"/>
+              <label form="short" prefix=" (" suffix=")"/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+                <choose>
+                  <if type="report">
+                    <text variable="publisher"/>
+                    <text macro="title"/>
+                  </if>
+                  <else>
+                    <text macro="title"/>
+                  </else>
+                </choose>
+              </substitute>
+            </names>
           </else>
         </choose>
-      </substitute>
-    </names>
+      </else>
+    </choose>
   </macro>
   <macro name="author-short">
     <names variable="author">
@@ -94,7 +125,7 @@
             <text variable="publisher"/>
             <text variable="title" form="short" font-style="italic"/>
           </if>
-          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
+          <else-if type="bill book graphic legal_case legislation motion_picture song map webpage post" match="any">
             <text variable="title" form="short" font-style="italic"/>
           </else-if>
           <else>
@@ -110,37 +141,46 @@
         <choose>
           <if variable="archive" match="any">
             <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="archive" suffix="."/>
+              <text variable="archive" suffix=". "/>
               <text variable="archive_location" prefix=" (" suffix=")"/>
+              <text variable="URL"/>
             </group>
           </if>
           <else>
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
+            <text variable="URL"/>
           </else>
         </choose>
       </if>
       <else>
         <choose>
           <if variable="DOI">
-            <text variable="DOI" prefix="doi:"/>
+            <text variable="DOI"/>
           </if>
-          <else>
+          <else-if type="post">
             <group delimiter=" ">
               <text term="retrieved" text-case="capitalize-first"/>
               <choose>
                 <if type="post">
                   <date variable="accessed" form="text" prefix="le "/>
                 </if>
+                <else>
+                  <date variable="accessed" form="text"/>
+                </else>
               </choose>
               <text term="from"/>
               <text variable="URL"/>
             </group>
+          </else-if>
+          <else>
+            <choose>
+              <if type="graphic">
+                <text variable="archive" suffix=". "/>
+                <text variable="URL"/>
+              </if>
+              <else>
+                <text variable="URL"/>
+              </else>
+            </choose>
           </else>
         </choose>
       </else>
@@ -150,13 +190,12 @@
     <choose>
       <if type="thesis" match="any">
         <text variable="title" font-style="italic"/>
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <text variable="genre"/>
-          <text variable="medium"/>
+        <group prefix=" [" suffix="]" delimiter=", ">
+          <text variable="genre" text-case="lowercase"/>
+          <text variable="medium" text-case="lowercase"/>
           <choose>
             <if variable="URL" match="any">
               <text variable="publisher"/>
-              <text variable="publisher-place"/>
             </if>
           </choose>
         </group>
@@ -174,7 +213,7 @@
           </choose>
         </group>
       </else-if>
-      <else-if type="book graphic motion_picture report song manuscript speech" match="any">
+      <else-if type="report" match="any">
         <!---This is a hack until we have a computer program type -->
         <choose>
           <if variable="version">
@@ -195,11 +234,39 @@
           </else>
         </choose>
       </else-if>
+      <else-if type="book" match="any">
+        <!---This is a hack until we have a computer program type -->
+        <text variable="title" font-style="italic"/>
+        <choose>
+          <if variable="version">
+            <group delimiter=" " prefix=" ">
+              <group delimiter=" " prefix="(" suffix=")">
+                <text term="version"/>
+                <text variable="version"/>
+              </group>
+              <text variable="genre" prefix=" [" suffix="]" text-case="lowercase"/>
+              <text variable="medium" prefix=" [" suffix="]" text-case="lowercase"/>
+            </group>
+          </if>
+          <else>
+            <text variable="genre" prefix=" [" suffix="]" text-case="capitalize-first"/>
+            <text variable="medium" prefix=" [" suffix="]" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </else-if>
       <else-if type="paper-conference">
         <text variable="title" font-style="italic"/>
         <text variable="genre" prefix=" [" suffix="]" text-case="capitalize-first"/>
         <text variable="medium" prefix=" [" suffix="]" text-case="capitalize-first"/>
       </else-if>
+      <else-if type="map motion_picture song graphic speech post manuscript webpage" match="any">
+        <text variable="title" font-style="italic"/>
+        <text variable="genre" prefix=" [" suffix="]" text-case="lowercase"/>
+        <text variable="medium" prefix=" [" suffix="]" text-case="lowercase"/>
+      </else-if>
+      <else-if type="broadcast">
+        <text variable="title"/>
+      </else-if>
       <else>
         <text variable="title"/>
         <text variable="genre" prefix=" [" suffix="]" text-case="capitalize-first"/>
@@ -209,34 +276,20 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter=" : ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </if>
-      <else-if type="thesis" match="any">
+      <if type="thesis" match="any">
         <choose>
           <if variable="URL archive" match="none">
-            <group delimiter=", ">
+            <group>
               <text variable="publisher"/>
-              <text variable="publisher-place"/>
             </group>
           </if>
         </choose>
-      </else-if>
-      <else>
-        <group delimiter=", ">
-          <choose>
-            <if type="article-journal article-magazine paper-conference" match="none">
-              <group delimiter=" : ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
-              </group>
-            </if>
-          </choose>
+      </if>
+      <else-if type="article-journal article-magazine paper-conference" match="none">
+        <group>
+          <text variable="publisher"/>
         </group>
-      </else>
+      </else-if>
     </choose>
   </macro>
   <macro name="event">
@@ -246,8 +299,12 @@
           <if variable="event">
             <choose>
               <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event"/>
+                <choose>
+                  <if type="paper-conference" match="none">
+                    <text term="presented at" text-case="capitalize-first" suffix=" "/>
+                    <text variable="event"/>
+                  </if>
+                </choose>
               </if>
               <else>
                 <group delimiter=" ">
@@ -273,9 +330,9 @@
               </date>
               <text variable="year-suffix"/>
               <choose>
-                <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="none">
+                <if type="article-journal bill book chapter legal_case legislation report song" match="none">
                   <date variable="issued" prefix=",">
-                    <date-part prefix=" " name="day"/>
+                    <date-part prefix=" " name="day" range-delimiter=" au "/>
                     <date-part prefix=" " name="month"/>
                   </date>
                 </if>
@@ -348,7 +405,6 @@
       </if>
       <else-if type="article-newspaper">
         <group delimiter=" " prefix=", ">
-          <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
@@ -401,21 +457,53 @@
   <macro name="container">
     <group>
       <choose>
-        <if type="chapter entry-encyclopedia" match="any">
+        <if type="chapter entry-encyclopedia entry-dictionary song" match="any">
           <text term="in" text-case="capitalize-first" suffix=" "/>
         </if>
       </choose>
+      <choose>
+        <if type="entry-dictionary entry-encyclopedia" match="any">
+          <names variable="editor" suffix=", ">
+            <name and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+            <et-al font-style="italic"/>
+            <label form="short" prefix=" (" suffix=")"/>
+          </names>
+        </if>
+        <else-if type="song">
+          <text variable="collection-title" font-style="italic"/>
+        </else-if>
+      </choose>
       <text macro="container-contributors"/>
       <choose>
         <if type="paper-conference">
           <group delimiter=", ">
-            <group delimiter=" ">
-              <text value="Communication présentée au"/>
-              <text macro="container-title"/>
-            </group>
+            <text variable="event"/>
             <text variable="publisher-place"/>
           </group>
         </if>
+        <else-if type="entry-dictionary">
+          <text macro="container-title"/>
+          <group prefix=" (" suffix=")">
+            <text variable="page" prefix="p. "/>
+          </group>
+        </else-if>
+        <else-if type="broadcast">
+          <group prefix=" (" suffix=")">
+            <choose>
+              <if is-numeric="number">
+                <!-- Replace with label variable="number" if that becomes available -->
+                <text term="issue" suffix=" " form="short"/>
+                <text variable="number"/>
+              </if>
+              <else>
+                <text variable="number"/>
+              </else>
+            </choose>
+          </group>
+          <text variable="genre" prefix=" [" suffix="]" text-case="lowercase"/>
+          <text variable="medium" prefix=" [" suffix="]" text-case="lowercase"/>
+          <text macro="container-title"/>
+        </else-if>
         <else>
           <text macro="container-title"/>
         </else>
@@ -440,10 +528,17 @@
       <if type="article article-journal article-magazine article-newspaper" match="any">
         <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
-      <else-if type="manuscript"/>
       <else-if type="paper-conference">
         <text variable="container-title" text-case="title"/>
       </else-if>
+      <else-if type="webpage">
+        <text variable="container-title"/>
+      </else-if>
+      <else-if type="broadcast">
+        <text term="in" text-case="capitalize-first" prefix=". " suffix=" "/>
+        <text variable="collection-title" font-style="italic"/>
+        <text variable="container-title" font-style="italic"/>
+      </else-if>
       <else-if type="bill legal_case legislation" match="none">
         <text variable="container-title" font-style="italic"/>
       </else-if>
@@ -482,7 +577,7 @@
       </else>
     </choose>
   </macro>
-  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
+  <citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="2" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
       <key macro="author"/>
       <key macro="issued-sort"/>
@@ -495,7 +590,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="2">
+  <bibliography hanging-indent="true" et-al-min="21" et-al-use-first="20" et-al-use-last="true" entry-spacing="0" line-spacing="2">
     <sort>
       <key macro="author"/>
       <key macro="issued-sort" sort="ascending"/>
@@ -503,12 +598,35 @@
     </sort>
     <layout>
       <group suffix=".">
-        <group delimiter=". ">
-          <text macro="author"/>
-          <text macro="issued"/>
-          <text macro="title" prefix=" "/>
-          <text macro="container"/>
-        </group>
+        <choose>
+          <if type="broadcast">
+            <group delimiter=". ">
+              <text macro="author"/>
+              <text macro="issued"/>
+              <text macro="title" prefix=" "/>
+            </group>
+            <text macro="container"/>
+          </if>
+          <else>
+            <group delimiter=". ">
+              <text macro="author"/>
+              <text macro="issued"/>
+              <choose>
+                <if type="entry-dictionary entry-encyclopedia" match="any">
+                  <choose>
+                    <if variable="author">
+                      <text macro="title" prefix=" "/>
+                    </if>
+                  </choose>
+                </if>
+                <else>
+                  <text macro="title" prefix=" "/>
+                </else>
+              </choose>
+              <text macro="container"/>
+            </group>
+          </else>
+        </choose>
         <text macro="locators"/>
         <group delimiter=", " prefix=". ">
           <text macro="event"/>