diff --git a/universite-du-quebec-a-montreal.csl b/universite-du-quebec-a-montreal.csl
index 7b6f0a146e1..fe647fab2f9 100644
--- a/universite-du-quebec-a-montreal.csl
+++ b/universite-du-quebec-a-montreal.csl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" et-al-min="3" et-al-use-first="1" demote-non-dropping-particle="never" default-locale="fr-CA">
   <info>
-    <title>Université du Québec à Montréal (Français - Canada)</title>
+    <title>Université du Québec à Montréal - APA (Français - Canada)</title>
     <title-short>UQAM</title-short>
     <id>http://www.zotero.org/styles/universite-du-quebec-a-montreal</id>
     <link href="http://www.zotero.org/styles/universite-du-quebec-a-montreal" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa-fr-provost" rel="template"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
     <link href="http://guides.bibliotheques.uqam.ca/themes/105-Logiciels-de-gestion-bibliographique?tab=563" rel="documentation"/>
     <link href="http://www.guidemt.uqam.ca/citer/style-uqam" rel="documentation"/>
     <author>
@@ -15,7 +15,7 @@
     <category citation-format="author-date"/>
     <category field="psychology"/>
     <category field="generic-base"/>
-    <summary>Le style UQAM est une adaptation canadienne-française de la norme APA 6th (2010) conforme au Guide de présentation des mémoires et des thèses de l'Université du Québec à Montréal</summary>
+    <summary>Le style UQAM APA est une adaptation française canadienne de la 7e édition de la norme APA conforme au Guide de présentation des mémoires et des thèses de l'Université du Québec à Montréal. Il remplace l'ancienne version qui portait le nom de style UQAM qui était basée sur la 6e édition du style APA.</summary>
     <updated>2019-11-13T20:36:26+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
@@ -35,9 +35,10 @@
       <term name="number-of-volumes" form="short">vol.</term>
       <term name="number">numéro</term>
       <term name="scale">échelle</term>
-      <term name="circa" form="short">ca</term>
+      <term name="circa" form="short">v. </term>
       <term name="interview" form="verb">interviewé par</term>
       <term name="author" form="verb">enregistré par</term>
+      <term name="number" form="short">n&amp;#7506;</term>
     </terms>
   </locale>
   <macro name="container-contributors">
@@ -80,7 +81,7 @@
           <label form="short" prefix=" (" suffix=")"/>
           <substitute>
             <choose>
-              <if type="entry-dictionary entry-encyclopedia webpage manuscript legislation legal_case bill treaty article map article-journal article-magazine article-newspaper" match="any">
+              <if type="entry-dictionary entry-encyclopedia webpage manuscript legislation legal_case bill treaty article map article-magazine article-newspaper" match="any">
                 <text macro="title"/>
               </if>
               <else-if type="book" match="any">
@@ -118,12 +119,9 @@
             <choose>
               <if variable="container-title">
                 <choose>
-                  <if type="book entry-dictionary entry-encyclopedia" match="any">
-                    <text macro="title"/>
+                  <if type="bill legal_case legislation treaty article-journal" match="none">
+                    <text variable="title" quotes="true"/>
                   </if>
-                  <else>
-                    <names variable="translator"/>
-                  </else>
                 </choose>
               </if>
             </choose>
@@ -132,10 +130,17 @@
             <choose>
               <if type="report">
                 <text variable="publisher"/>
-                <text macro="title" font-style="italic"/>
+                <text variable="title" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" font-style="italic"/>
+                <choose>
+                  <if match="any" variable="title-short">
+                    <text variable="title-short" quotes="false"/>
+                  </if>
+                  <else>
+                    <text variable="title" font-style="italic"/>
+                  </else>
+                </choose>
               </else>
             </choose>
           </substitute>
@@ -148,33 +153,39 @@
       <if type="thesis dataset" match="any">
         <choose>
           <if variable="DOI">
-            <text variable="DOI" prefix="doi: "/>
+            <text variable="DOI" prefix="https://doi.org/"/>
           </if>
           <else-if variable="archive" match="any">
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
+            <group delimiter=". ">
               <text variable="archive" suffix="."/>
-              <text variable="archive_location" prefix=" (" suffix=")"/>
+              <text variable="URL"/>
             </group>
           </else-if>
           <else>
-            <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-              <text term="from" suffix=" "/>
-              <text variable="URL"/>
-            </group>
+            <choose>
+              <if type="dataset" match="all" variable="accessed">
+                <group delimiter=" ">
+                  <text term="retrieved" text-case="capitalize-first"/>
+                  <date form="text" variable="accessed" prefix="le "/>
+                  <text term="from"/>
+                  <text variable="URL"/>
+                </group>
+              </if>
+              <else>
+                <text variable="URL"/>
+              </else>
+            </choose>
           </else>
         </choose>
       </if>
       <else>
         <choose>
           <if variable="DOI">
-            <text variable="DOI" prefix="doi: "/>
+            <text variable="DOI" prefix="https://doi.org/"/>
           </if>
           <else>
             <choose>
-              <if type="entry-encyclopedia">
+              <if type="entry-encyclopedia entry-dictionary map article" match="any">
                 <choose>
                   <if match="any" variable="accessed">
                     <group delimiter=" ">
@@ -185,25 +196,12 @@
                     </group>
                   </if>
                   <else>
-                    <group delimiter=" ">
-                      <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                      <text term="from"/>
-                      <text variable="URL"/>
-                    </group>
+                    <text variable="URL"/>
                   </else>
                 </choose>
               </if>
               <else>
-                <group delimiter=" ">
-                  <text term="retrieved" text-case="capitalize-first"/>
-                  <text term="from"/>
-                  <choose>
-                    <if type="report" match="any">
-                      <text variable="source" suffix=" : "/>
-                    </if>
-                  </choose>
-                  <text variable="URL"/>
-                </group>
+                <text variable="URL"/>
               </else>
             </choose>
           </else>
@@ -239,28 +237,18 @@
         <group delimiter=" " suffix=". ">
           <text term="interview" form="verb" text-case="capitalize-first"/>
           <names variable="interviewer">
-            <name and="text"/>
+            <name and="text" initialize-with="."/>
           </names>
         </group>
         <text variable="title"/>
       </else-if>
-      <else-if type="review-book" match="any">
-        <group delimiter=" " prefix="[" suffix="]">
-          <text variable="title" suffix=". "/>
-          <text variable="reviewed-title" font-style="italic" prefix="Compte rendu du livre " suffix=","/>
-          <text term="by"/>
-          <names variable="reviewed-author">
-            <name and="text" delimiter-precedes-last="never"/>
-          </names>
-        </group>
-      </else-if>
       <else-if type="legal_case" match="all" variable="references">
         <text variable="title" font-style="italic" suffix=","/>
       </else-if>
-      <else-if type="thesis report book graphic manuscript speech dataset legal_case treaty article" match="any">
+      <else-if type="thesis report book graphic manuscript speech dataset legal_case treaty article webpage" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
-      <else-if type="motion_picture broadcast figure map article-journal webpage entry-encyclopedia song musical_score" match="any">
+      <else-if type="motion_picture broadcast figure map article-journal entry-encyclopedia song musical_score" match="any">
         <choose>
           <if match="any" variable="container-title">
             <text variable="title"/>
@@ -271,7 +259,7 @@
         </choose>
       </else-if>
       <else-if type="patent" match="any">
-        <text variable="title" font-style="italic" suffix="."/>
+        <text variable="title" font-style="italic"/>
       </else-if>
       <else>
         <text variable="title"/>
@@ -280,70 +268,31 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="report" match="any">
-        <group delimiter="&#160;: ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </if>
-      <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="publisher"/>
-        </group>
-      </else-if>
-      <else-if type="speech" match="any">
+      <if type="speech" match="any">
         <text variable="publisher-place"/>
-      </else-if>
-      <else-if type="post-weblog post" match="none">
+      </if>
+      <else-if type="post thesis" match="none">
         <group delimiter=", ">
           <choose>
-            <if type="book chapter" match="any">
-              <choose>
-                <if match="none" variable="publisher-place publisher">
-                  <choose>
-                    <if match="any" variable="URL"/>
-                    <else>
-                      <text value="(s. l. : n. é.)"/>
-                    </else>
-                  </choose>
-                </if>
-                <else>
-                  <group delimiter="&#160;: ">
-                    <choose>
-                      <if variable="publisher-place">
-                        <text variable="publisher-place"/>
-                      </if>
-                      <else-if match="any" variable="URL"/>
-                      <else>
-                        <text value="s. l." prefix="(" suffix=")"/>
-                      </else>
-                    </choose>
-                    <choose>
-                      <if variable="publisher">
-                        <text variable="publisher"/>
-                      </if>
-                      <else-if match="any" variable="URL"/>
-                      <else>
-                        <text value="(s. é.)"/>
-                      </else>
-                    </choose>
-                  </group>
-                </else>
-              </choose>
+            <if type="book chapter report" match="any">
+              <text variable="publisher"/>
             </if>
             <else-if type="patent">
-              <group delimiter=" : ">
-                <text variable="publisher-place"/>
+              <group delimiter=", ">
                 <text variable="authority"/>
                 <text variable="publisher"/>
               </group>
             </else-if>
             <else-if type="broadcast interview" match="all" variable="container-title"/>
-            <else-if type="article-journal article-magazine article-newspaper" match="none">
-              <group delimiter="&#160;: ">
-                <text variable="publisher-place"/>
-                <text variable="publisher"/>
+            <else-if type="manuscript" match="any">
+              <group delimiter=" ">
+                <text variable="archive"/>
+                <text variable="archive_location" prefix="(" suffix=")"/>
               </group>
+              <text variable="publisher-place"/>
+            </else-if>
+            <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none">
+              <text variable="publisher"/>
             </else-if>
           </choose>
         </group>
@@ -355,27 +304,10 @@
       <if variable="container-title" match="none">
         <choose>
           <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <group delimiter=" ">
-                  <text term="presented at" text-case="capitalize-first"/>
-                  <text variable="event"/>
-                </group>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
-                  <text variable="event"/>
-                </group>
-              </else>
-            </choose>
+            <text variable="event"/>
           </if>
           <else-if type="speech" match="any">
-            <group delimiter=" ">
-              <text term="presented at" text-case="capitalize-first"/>
-              <text variable="publisher"/>
-            </group>
+            <text variable="publisher"/>
           </else-if>
         </choose>
       </if>
@@ -421,7 +353,7 @@
     <choose>
       <if match="any" variable="original-date">
         <choose>
-          <if type="musical_score book" match="any">
+          <if type="musical_score book song" match="any">
             <group prefix="(" suffix=")">
               <date date-parts="year" form="text" variable="issued"/>
               <text variable="year-suffix"/>
@@ -465,7 +397,7 @@
       <else-if variable="issued">
         <choose>
           <if type="legal_case" match="all" variable="references"/>
-          <else-if type="legislation bill legal_case" match="any">
+          <else-if type="bill legal_case" match="any">
             <group prefix="(" suffix=").">
               <date date-parts="year" form="text" variable="issued">
                 <date-part name="year"/>
@@ -476,8 +408,21 @@
               </date>
             </group>
           </else-if>
-          <else>
+          <else-if type="legislation" match="any"/>
+          <else-if type="dataset" match="any">
             <group prefix="(" suffix=")">
+              <date delimiter="" variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix" prefix="-"/>
+              <date delimiter="" variable="issued" prefix=", ">
+                <date-part name="day"/>
+                <date-part name="month" prefix=" "/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <group prefix="(" suffix=").">
               <date variable="issued">
                 <date-part name="year"/>
               </date>
@@ -560,21 +505,36 @@
         </group>
       </else-if>
       <else-if variable="issued">
-        <group delimiter="/">
-          <date variable="original-date" form="text"/>
-          <group>
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text variable="year-suffix"/>
-          </group>
-        </group>
+        <choose>
+          <if type="legislation" match="any"/>
+          <else>
+            <group delimiter="/">
+              <date variable="original-date" form="text"/>
+              <group>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text variable="year-suffix"/>
+              </group>
+            </group>
+          </else>
+        </choose>
       </else-if>
       <else>
-        <group delimiter="-">
-          <text term="no date" form="short"/>
-          <text variable="year-suffix"/>
-        </group>
+        <choose>
+          <if type="legislation" match="any">
+            <group delimiter=" ">
+              <text variable="container-title"/>
+              <text variable="section" prefix="(" suffix=")"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter="-">
+              <text term="no date" form="short"/>
+              <text variable="year-suffix"/>
+            </group>
+          </else>
+        </choose>
       </else>
     </choose>
   </macro>
@@ -591,14 +551,18 @@
       </else>
     </choose>
   </macro>
-  <macro name="translation">
+  <macro name="translation-illustration">
     <choose>
-      <if variable="translator">
+      <if variable="translator illustrator" match="any">
         <group delimiter=", ">
           <names variable="translator" delimiter=", " prefix=" ">
             <name and="text" delimiter-precedes-last="never" initialize-with=". "/>
+            <label form="short" prefix=", "/>
+          </names>
+          <names variable="illustrator">
+            <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+            <label form="short" prefix=", "/>
           </names>
-          <text term="translator" form="short"/>
         </group>
       </if>
     </choose>
@@ -619,17 +583,14 @@
         <text variable="publisher-place" prefix=" (" suffix=")"/>
         <group delimiter=", " prefix=", ">
           <text variable="section" prefix="section "/>
-          <group delimiter=" ">
-            <label variable="page" form="short"/>
-            <text variable="page"/>
-          </group>
+          <text variable="page"/>
         </group>
       </else-if>
       <else-if type="book paper-conference entry-encyclopedia chapter entry-dictionary musical_score map figure" match="any">
         <group prefix=" (" suffix=")" delimiter=", ">
           <group delimiter=", ">
             <text macro="edition"/>
-            <text macro="translation"/>
+            <text macro="translation-illustration"/>
           </group>
           <group delimiter=" ">
             <label variable="volume" form="short"/>
@@ -650,24 +611,14 @@
         </group>
         <choose>
           <if type="book" match="any">
+            <text variable="number" prefix=" (" suffix=")"/>
             <group prefix=" [" suffix="]">
               <text variable="genre"/>
               <text variable="medium"/>
             </group>
-            <text variable="number" prefix=". "/>
           </if>
-          <else-if type="musical_score" match="all" variable="container-title">
-            <text variable="medium" prefix=" [" suffix="]"/>
-            <text variable="genre" prefix=" [" suffix="]"/>
-          </else-if>
         </choose>
       </else-if>
-      <else-if type="manuscript" match="any">
-        <group delimiter=" " prefix=". ">
-          <text variable="archive"/>
-          <text variable="archive_location" prefix="(" suffix=")"/>
-        </group>
-      </else-if>
       <else-if type="legal_case" match="any">
         <group delimiter=" " prefix=" ">
           <text variable="number"/>
@@ -680,8 +631,8 @@
             </else-if>
           </choose>
           <text variable="page"/>
-          <text variable="source" prefix="(" suffix=")"/>
         </group>
+        <text variable="source" prefix=". "/>
       </else-if>
       <else-if type="treaty" match="any">
         <group delimiter=", ">
@@ -720,7 +671,7 @@
   <macro name="container">
     <group>
       <choose>
-        <if type="chapter paper-conference entry-encyclopedia entry-dictionary webpage song musical_score figure" match="any">
+        <if type="chapter paper-conference entry-encyclopedia entry-dictionary song musical_score figure broadcast interview" match="any">
           <choose>
             <if match="any" variable="container-title">
               <text term="in" text-case="capitalize-first" suffix=" "/>
@@ -730,17 +681,6 @@
         <else-if type="map" match="all" variable="container-author">
           <text term="in" text-case="capitalize-first" suffix=" "/>
         </else-if>
-        <else-if type="broadcast interview" match="any">
-          <choose>
-            <if match="any" variable="container-title">
-              <choose>
-                <if match="any" variable="container-author editor publisher">
-                  <text term="in" text-case="capitalize-first" suffix=" "/>
-                </if>
-              </choose>
-            </if>
-          </choose>
-        </else-if>
       </choose>
       <text macro="container-contributors"/>
       <text macro="secondary-contributors"/>
@@ -749,7 +689,7 @@
   </macro>
   <macro name="container-title">
     <choose>
-      <if type="bill legislation legal_case treaty report" match="none">
+      <if type="bill legislation legal_case treaty report webpage" match="none">
         <text variable="container-title" font-style="italic"/>
       </if>
       <else-if type="legal_case treaty report" match="any">
@@ -760,7 +700,7 @@
         </choose>
       </else-if>
       <else>
-        <group delimiter=" " prefix=", ">
+        <group delimiter=" ">
           <choose>
             <if variable="container-title">
               <choose>
@@ -781,24 +721,18 @@
   </macro>
   <macro name="original-date">
     <choose>
-      <if variable="original-date" type="song">
-        <date form="text" variable="issued" prefix="(" suffix=")"/>
-      </if>
-      <else-if type="musical_score" match="any">
-        <date form="text" variable="original-date" prefix="(" suffix=")"/>
-      </else-if>
-      <else-if type="book" match="all" variable="original-date">
-        <group delimiter=" " prefix=" (" suffix=").">
-          <text value="Oeuvre originale publiée en "/>
-          <date variable="original-date" prefix="&amp;#169;">
+      <if type="song musical_score book" match="any">
+        <group prefix="(" suffix=")">
+          <text value="Publication originale en "/>
+          <date variable="original-date">
             <date-part name="year"/>
           </date>
         </group>
-      </else-if>
+      </if>
       <else-if type="treaty" match="any">
         <choose>
           <if match="any" variable="original-date">
-            <group delimiter=" " prefix="[" suffix="].">
+            <group delimiter=" " suffix=".">
               <text value="Entrée en vigueur le"/>
               <date form="text" variable="issued">
                 <date-part name="day" form="ordinal"/>
@@ -812,12 +746,14 @@
   <macro name="title-extra">
     <choose>
       <if type="thesis" match="any">
-        <group delimiter=", " prefix="(" suffix=")">
+        <text variable="archive_location" prefix="(Publication n&amp;#7506;  " suffix=") "/>
+        <group delimiter=", " prefix="[" suffix="]">
           <group delimiter=" ">
             <text term="version"/>
             <text variable="version"/>
           </group>
           <text variable="genre"/>
+          <text variable="publisher"/>
         </group>
       </if>
       <else-if type="article-journal" match="any">
@@ -832,14 +768,16 @@
         </group>
       </else-if>
       <else-if type="report" match="any">
-        <group delimiter=" " prefix="[" suffix="]">
-          <text variable="genre"/>
-          <text variable="medium"/>
-        </group>
-        <text variable="number" prefix="(" suffix=")"/>
-        <group delimiter=" " prefix=". ">
-          <text term="number" text-case="capitalize-first"/>
-          <text variable="archive_location"/>
+        <group delimiter=" ">
+          <text variable="number" prefix="(" suffix=")"/>
+          <group delimiter=" " prefix="[" suffix="]">
+            <text variable="genre"/>
+            <text variable="medium"/>
+          </group>
+          <group delimiter=" " prefix=". ">
+            <text term="number" text-case="capitalize-first"/>
+            <text variable="archive_location"/>
+          </group>
         </group>
       </else-if>
       <else-if type="webpage dataset" match="any">
@@ -847,15 +785,15 @@
           <text term="version"/>
           <text variable="version"/>
         </group>
-        <group delimiter=". " prefix=" ">
+        <group delimiter=" " prefix=" ">
+          <text variable="number" prefix="(" suffix=")"/>
           <text variable="genre" prefix="[" suffix="]"/>
-          <text variable="number"/>
         </group>
       </else-if>
       <else-if type="patent" match="any">
-        <group delimiter=" ">
-          <text variable="number" font-style="italic"/>
-          <text variable="genre" prefix="[" suffix="]"/>
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="genre"/>
+          <text variable="number" font-style="normal"/>
         </group>
       </else-if>
       <else-if type="song musical_score" match="any">
@@ -868,21 +806,13 @@
                   <name and="text" delimiter-precedes-last="never"/>
                 </names>
               </group>
-              <choose>
-                <if match="none" variable="container-title">
-                  <text variable="medium"/>
-                  <text variable="genre"/>
-                </if>
-              </choose>
+              <text variable="medium"/>
+              <text variable="genre"/>
             </group>
           </if>
           <else>
-            <choose>
-              <if match="none" variable="container-title">
-                <text variable="medium" prefix="[" suffix="]"/>
-                <text variable="genre" prefix="[" suffix="]"/>
-              </if>
-            </choose>
+            <text variable="medium" prefix="[" suffix="]"/>
+            <text variable="genre" prefix="[" suffix="]"/>
           </else>
         </choose>
       </else-if>
@@ -893,6 +823,27 @@
           <text variable="authority"/>
         </group>
       </else-if>
+      <else-if type="review-book" match="any">
+        <group delimiter=" " prefix="[" suffix="]">
+          <text variable="reviewed-title" font-style="italic" prefix="Compte rendu du livre " suffix=","/>
+          <text term="by"/>
+          <names variable="reviewed-author">
+            <name and="text" delimiter-precedes-last="never" initialize-with="."/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="broadcast" match="any">
+        <group delimiter=" ">
+          <group delimiter=" " prefix="(" suffix=")">
+            <text term="number" form="short"/>
+            <text variable="number"/>
+          </group>
+          <group prefix="[" suffix="]">
+            <text variable="medium"/>
+            <text variable="genre"/>
+          </group>
+        </group>
+      </else-if>
       <else>
         <choose>
           <if type="musical_score book article" match="none">
@@ -919,14 +870,10 @@
   </macro>
   <macro name="container-title-extra">
     <choose>
-      <if type="song" match="all" variable="container-title">
-        <text variable="medium" prefix=" [" suffix="]"/>
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </if>
-      <else-if type="map" match="any">
+      <if type="map" match="all">
         <text variable="collection-title" prefix=". "/>
         <text variable="number" prefix=", "/>
-      </else-if>
+      </if>
       <else-if type="article" match="any">
         <text variable="number" prefix=" (" suffix=")"/>
         <choose>
@@ -953,7 +900,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography et-al-min="8" et-al-use-first="6" et-al-use-last="true" entry-spacing="1" hanging-indent="true">
+  <bibliography delimiter-precedes-last="never" et-al-min="21" et-al-use-first="19" et-al-use-last="true" hanging-indent="true">
     <sort>
       <key macro="author"/>
       <key macro="issued-sort" sort="ascending"/>