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"/>