diff --git a/apa-numeric-superscript-brackets.csl b/apa-numeric-superscript-brackets.csl
index 836b4a003e3..2132ba8f127 100644
--- a/apa-numeric-superscript-brackets.csl
+++ b/apa-numeric-superscript-brackets.csl
@@ -3,7 +3,6 @@
   <info>
     <title>American Psychological Association 7th edition (numeric, brackets)</title>
     <title-short>APA (numeric, superscript, brackets)</title-short>
-    <summary>APA style, with numeric in-text citations in brackets</summary>
     <id>http://www.zotero.org/styles/apa-numeric-superscript-brackets</id>
     <link href="http://www.zotero.org/styles/apa-numeric-superscript-brackets" rel="self"/>
     <link href="http://www.zotero.org/styles/apa" rel="template"/>
@@ -15,6 +14,7 @@
     <category citation-format="numeric"/>
     <category field="psychology"/>
     <category field="generic-base"/>
+    <summary>APA style, with numeric in-text citations in brackets</summary>
     <updated>2019-12-04T13:09:49+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>
@@ -1708,4 +1708,4 @@
       </group>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/apa-numeric-superscript.csl b/apa-numeric-superscript.csl
index f1398664d5d..23861440c6b 100644
--- a/apa-numeric-superscript.csl
+++ b/apa-numeric-superscript.csl
@@ -3,7 +3,6 @@
   <info>
     <title>American Psychological Association 7th edition (numeric, superscript)</title>
     <title-short>APA (numeric)</title-short>
-    <summary>APA style, with superscript numeric in-text citations</summary>
     <id>http://www.zotero.org/styles/apa-numeric-superscript</id>
     <link href="http://www.zotero.org/styles/apa-numeric-superscript" rel="self"/>
     <link href="http://www.zotero.org/styles/apa" rel="template"/>
@@ -15,6 +14,7 @@
     <category citation-format="numeric"/>
     <category field="psychology"/>
     <category field="generic-base"/>
+    <summary>APA style, with superscript numeric in-text citations</summary>
     <updated>2019-12-04T13:09:49+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>
diff --git a/british-journal-of-clinical-pharmacology.csl b/british-journal-of-clinical-pharmacology.csl
index 0490ef5b53f..12c89fe6ee5 100644
--- a/british-journal-of-clinical-pharmacology.csl
+++ b/british-journal-of-clinical-pharmacology.csl
@@ -11,8 +11,8 @@
     <category field="medicine"/>
     <issn>0306-5251</issn>
     <eissn>1365-2125</eissn>
-    <updated>2020-04-23T13:38:04+00:00</updated>
     <summary>AMA style with square-brackets</summary>
+    <updated>2020-04-23T13:38:04+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
diff --git a/evolution-letters.csl b/evolution-letters.csl
index 2c2014a3811..78f0964c90e 100644
--- a/evolution-letters.csl
+++ b/evolution-letters.csl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-US" version="1.0">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
diff --git a/geschichte-und-gesellschaft.csl b/geschichte-und-gesellschaft.csl
index 0db69b105f7..ef179431756 100644
--- a/geschichte-und-gesellschaft.csl
+++ b/geschichte-und-gesellschaft.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" et-al-min="3" et-al-use-first="1" demote-non-dropping-particle="sort-only">
-    <!-- Polyglot; journal publishes in German and English. -->
-    <info>
+  <!-- Polyglot; journal publishes in German and English. -->
+  <info>
     <title>Geschichte und Gesellschaft</title>
     <id>http://www.zotero.org/styles/geschichte-und-gesellschaft</id>
     <link href="http://www.zotero.org/styles/geschichte-und-gesellschaft" rel="self"/>
diff --git a/haaga-helia-university-of-applied-sciences-harvard.csl b/haaga-helia-university-of-applied-sciences-harvard.csl
index 39b49b1fe80..79abbe2b340 100644
--- a/haaga-helia-university-of-applied-sciences-harvard.csl
+++ b/haaga-helia-university-of-applied-sciences-harvard.csl
@@ -154,7 +154,7 @@
   </macro>
   <macro name="issued">
     <choose>
-      <if type="legislation"></if>
+      <if type="legislation"/>
       <else-if variable="issued">
         <choose>
           <if type="personal_communication speech post" match="any">
diff --git a/harvard-institut-fur-praxisforschung-de.csl b/harvard-institut-fur-praxisforschung-de.csl
index 573f5746b5c..dc8e6ecb288 100644
--- a/harvard-institut-fur-praxisforschung-de.csl
+++ b/harvard-institut-fur-praxisforschung-de.csl
@@ -228,7 +228,7 @@
         <group delimiter=", ">
           <group delimiter=" ">
             <text macro="publisher"/>
-            <text variable="collection-title"  prefix="(" suffix=")"/>
+            <text variable="collection-title" prefix="(" suffix=")"/>
           </group>
           <text macro="locator"/>
           <text macro="published-date"/>
diff --git a/istanbul-universitesi-sosyal-bilimler-enstitusu.csl b/istanbul-universitesi-sosyal-bilimler-enstitusu.csl
index 2b4f67b1f7d..094dd597b43 100644
--- a/istanbul-universitesi-sosyal-bilimler-enstitusu.csl
+++ b/istanbul-universitesi-sosyal-bilimler-enstitusu.csl
@@ -227,7 +227,8 @@
           <text term="version"/>
           <text variable="version"/>
         </group>
-      </else-if>      <else-if type="book graphic motion_picture song manuscript" match="any">
+      </else-if>
+      <else-if type="book graphic motion_picture song manuscript" match="any">
         <text variable="title" text-case="title" font-style="normal" font-weight="bold"/>
         <group delimiter=" " prefix=", ">
           <text term="version"/>
@@ -244,11 +245,10 @@
         <text variable="title" text-case="title" quotes="true"/>
       </else>
     </choose>
-
-         <choose>
-        <if type="entry-encyclopedia" match="any">
-          <text variable="container-title" prefix=", " text-case="title" font-style="normal" font-weight="bold"/>
-        </if>
+    <choose>
+      <if type="entry-encyclopedia" match="any">
+        <text variable="container-title" prefix=", " text-case="title" font-style="normal" font-weight="bold"/>
+      </if>
     </choose>
   </macro>
   <macro name="title">
@@ -299,25 +299,24 @@
       </else>
     </choose>
     <choose>
-        <if type="entry-encyclopedia" match="any">
-          <text variable="container-title" prefix=" " text-case="title" font-style="normal" font-weight="bold"/>
-        </if>
+      <if type="entry-encyclopedia" match="any">
+        <text variable="container-title" prefix=" " text-case="title" font-style="normal" font-weight="bold"/>
+      </if>
     </choose>
-        <group>
-
-          <choose>
-            <if match="any" variable="volume">
+    <group>
+      <choose>
+        <if match="any" variable="volume">
           <choose>
-                <if type="article-journal" variable="volume" match="all">
+            <if type="article-journal" variable="volume" match="all">
                 </if>
-                <else>
-        <label plural="never" prefix=", " suffix=" " variable="volume" form="short"/>
+            <else>
+              <label plural="never" prefix=", " suffix=" " variable="volume" form="short"/>
               <text variable="volume"/>
-                </else>
-          </choose>
-            </if>
+            </else>
           </choose>
-        </group>
+        </if>
+      </choose>
+    </group>
   </macro>
   <macro name="title-short">
     <choose>
@@ -352,20 +351,20 @@
     </choose>
   </macro>
   <macro name="description-note">
-        <group>
-          <choose>
-            <if match="any" variable="volume">
+    <group>
+      <choose>
+        <if match="any" variable="volume">
           <choose>
-                              <if type="article-journal" variable="volume" match="all">
+            <if type="article-journal" variable="volume" match="all">
                 </if>
-                <else>
-        <label plural="never" prefix="" suffix=" " variable="volume" form="short"/>
+            <else>
+              <label plural="never" prefix="" suffix=" " variable="volume" form="short"/>
               <text variable="volume"/>
-                </else>
-          </choose>
-            </if>
+            </else>
           </choose>
-        </group>
+        </if>
+      </choose>
+    </group>
     <group delimiter=", ">
       <text macro="interviewer-note"/>
       <text variable="medium"/>
@@ -414,10 +413,8 @@
         <if type="bill entry-encyclopedia legislation legal_case" match="none">
           <text variable="container-title" text-case="title" font-style="normal" font-weight="bold"/>
         </if>
-
         <else-if type="entry-encyclopedia" match="any">
         </else-if>
-
       </choose>
     </group>
   </macro>
@@ -438,10 +435,8 @@
             </choose>
           </group>
         </if>
-
-<else-if type="entry-encyclopedia" match="any">
+        <else-if type="entry-encyclopedia" match="any">
 </else-if>
-
       </choose>
     </group>
   </macro>
@@ -920,12 +915,10 @@
       <if type="article-journal chapter" match="none">
         <text macro="point-locators"/>
       </if>
-
       <else-if type="chapter" match="any">
-          <label plural="never" suffix=" " variable="locator" form="short"/>
-          <text variable="locator"/>
+        <label plural="never" suffix=" " variable="locator" form="short"/>
+        <text variable="locator"/>
       </else-if>
-
       <else-if variable="volume issue" match="none">
         <text macro="point-locators"/>
       </else-if>
@@ -961,7 +954,6 @@
               </choose>
             </group>
           </else-if>
-
           <else-if type="chapter entry-encyclopedia" match="any">
             <group>
               <choose>
@@ -980,7 +972,6 @@
               </choose>
             </group>
           </else-if>
-
         </choose>
       </if>
       <else-if type="article-journal">
@@ -1008,9 +999,6 @@
       </else-if>
       <else>
         <group delimiter=" ">
-
-
-
           <label plural="never" suffix=" " variable="locator" form="short"/>
           <text variable="locator"/>
         </group>
@@ -1050,13 +1038,10 @@
         <label plural="never" suffix=" " variable="page" form="short"/>
         <text variable="page"/>
       </else-if>
-
       <else-if type="chapter entry-encyclopedia" match="any">
         <label plural="never" prefix=", " suffix=" " variable="page" form="short"/>
         <text variable="page"/>
       </else-if>
-
-
       <else-if type="paper-conference" match="any">
         <group>
           <choose>
@@ -1161,7 +1146,6 @@
       </else-if>
       <else-if variable="publisher-place event-place publisher genre" match="any">
         <group delimiter=", ">
-
           <text macro="event-note"/>
           <group delimiter=", ">
             <text macro="originally-published"/>
@@ -1169,15 +1153,15 @@
               <text macro="reprint-note"/>
               <text macro="publisher"/>
             </group>
-          <choose>
-            <if variable="title" match="none"/>
-            <else-if type="thesis" match="any">
-              <text variable="genre" prefix="" suffix=" Tezi"/>
-            </else-if>
-            <else-if type="manuscript speech" match="any">
-              <text variable="genre" prefix="(" suffix=")"/>
-            </else-if>
-          </choose>
+            <choose>
+              <if variable="title" match="none"/>
+              <else-if type="thesis" match="any">
+                <text variable="genre" prefix="" suffix=" Tezi"/>
+              </else-if>
+              <else-if type="manuscript speech" match="any">
+                <text variable="genre" prefix="(" suffix=")"/>
+              </else-if>
+            </choose>
           </group>
           <text macro="issued"/>
         </group>
@@ -1312,10 +1296,10 @@
               <text variable="DOI" prefix="doi:"/>
             </if>
             <else>
-          <group delimiter="">
-              <text variable="URL" prefix="(Çevrimiçi) "/>
-            <date form="numeric" variable="accessed" prefix=", "/>
-          </group>
+              <group delimiter="">
+                <text variable="URL" prefix="(Çevrimiçi) "/>
+                <date form="numeric" variable="accessed" prefix=", "/>
+              </group>
             </else>
           </choose>
         </if>
@@ -1346,12 +1330,11 @@
               <text variable="DOI" prefix=", doi:"/>
             </if>
             <else>
-          <group delimiter="">
-              <text variable="URL" prefix=", (Çevrimiçi) "/>
-            <date form="numeric" variable="accessed" prefix=", "/>
-          </group>
+              <group delimiter="">
+                <text variable="URL" prefix=", (Çevrimiçi) "/>
+                <date form="numeric" variable="accessed" prefix=", "/>
+              </group>
             </else>
-
           </choose>
         </if>
       </choose>
@@ -1395,30 +1378,27 @@
             <text macro="point-locators-subsequent"/>
           </group>
         </if>
-
         <else-if position="ibid">
- <choose>
-<if variable="container-author author" match="none">
-         <group delimiter=", ">
-          <text term="ibid" text-case="lowercase" font-weight="bold"/>
-          </group>
-</if>
-<else>
-          <group delimiter=", ">
-            <text macro="contributors-short"/>
-          <text term="ibid" text-case="lowercase" font-weight="bold"/>
-          </group>
-</else>
-</choose>
+          <choose>
+            <if variable="container-author author" match="none">
+              <group delimiter=", ">
+                <text term="ibid" text-case="lowercase" font-weight="bold"/>
+              </group>
+            </if>
+            <else>
+              <group delimiter=", ">
+                <text macro="contributors-short"/>
+                <text term="ibid" text-case="lowercase" font-weight="bold"/>
+              </group>
+            </else>
+          </choose>
         </else-if>
-
-<else-if position="near-note">
+        <else-if position="near-note">
           <group delimiter=", ">
             <text macro="contributors-short"/>
             <group delimiter=" ">
               <group delimiter=", ">
                 <text macro="title-short"/>
-
                 <text macro="case-locator-subsequent"/>
               </group>
               <text macro="case-pinpoint-subsequent"/>
@@ -1430,14 +1410,12 @@
             </choose>
           </group>
         </else-if>
-
         <else-if position="subsequent">
           <group delimiter=", ">
             <text macro="contributors-short"/>
             <group delimiter=" ">
               <group delimiter=", ">
                 <text macro="title-short"/>
-
                 <text macro="case-locator-subsequent"/>
               </group>
               <text macro="case-pinpoint-subsequent"/>
@@ -1462,8 +1440,8 @@
                           <text macro="title-note" suffix=","/>
                         </group>
                         <text macro="description-note"/>
-                        <text macro="secondary-contributors-note"/>                        <text macro="container-title-note" suffix=","/>
-
+                        <text macro="secondary-contributors-note"/>
+                        <text macro="container-title-note" suffix=","/>
                         <text macro="container-contributors-note"/>
                       </group>
                       <text macro="locators-note-join-with-space"/>
diff --git a/journal-of-human-rights.csl b/journal-of-human-rights.csl
index 7dc795ccc80..c2ba9d0e9d9 100644
--- a/journal-of-human-rights.csl
+++ b/journal-of-human-rights.csl
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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" default-locale="en-GB">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Journal of Human Rights</title>
     <id>http://www.zotero.org/styles/journal-of-human-rights</id>
     <link href="http://www.zotero.org/styles/journal-of-human-rights" rel="self"/>
-    <link href="https://jhr.uconn.edu/submissions/" rel="documentation"/>
     <link href="http://www.zotero.org/styles/climate-change-economics" rel="template"/>
+    <link href="https://jhr.uconn.edu/submissions/" rel="documentation"/>
     <author>
       <name>Sebastian Karcher</name>
     </author>
diff --git a/mammalia.csl b/mammalia.csl
index 40d90799a3d..23116cb37ca 100644
--- a/mammalia.csl
+++ b/mammalia.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" version="1.0" default-locale="en-GB" xmlns="http://purl.org/net/xbiblio/csl">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-GB">
   <info>
     <title>Mammalia</title>
     <id>http://www.zotero.org/styles/mammalia</id>
diff --git a/offa.csl b/offa.csl
index e197526d792..d6211e23b1b 100644
--- a/offa.csl
+++ b/offa.csl
@@ -91,16 +91,16 @@
   </macro>
   <macro name="contributors">
     <group suffix=", ">
-    <choose>
-      <if variable="author">
-        <names variable="author">
-          <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". "/>
-        </names>
-      </if>
-      <else-if variable="editor">
-        <text macro="editor"/>
-      </else-if>
-    </choose>
+      <choose>
+        <if variable="author">
+          <names variable="author">
+            <name delimiter="/" delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". "/>
+          </names>
+        </if>
+        <else-if variable="editor">
+          <text macro="editor"/>
+        </else-if>
+      </choose>
     </group>
   </macro>
   <macro name="contributors-short-citation">
@@ -309,7 +309,7 @@
     </choose>
   </macro>
   <macro name="doi">
-  <text variable="DOI" prefix=". DOI: https://doi.org/"/>
+    <text variable="DOI" prefix=". DOI: https://doi.org/"/>
   </macro>
   <macro name="review">
     <choose>
@@ -411,7 +411,7 @@
             </else>
           </choose>
           <choose>
-          <if variable="DOI" match="any">
+            <if variable="DOI" match="any">
               <text macro="doi"/>
             </if>
             <else>
diff --git a/ophthalmic-genetics.csl b/ophthalmic-genetics.csl
index 6783ce76944..07c0a36bccc 100644
--- a/ophthalmic-genetics.csl
+++ b/ophthalmic-genetics.csl
@@ -108,7 +108,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout  delimiter=", " prefix=" (" suffix=")">
+    <layout delimiter=", " prefix=" (" suffix=")">
       <text variable="citation-number"/>
       <group prefix=", ">
         <label variable="locator" form="short" strip-periods="true"/>
diff --git a/research-institute-for-nature-and-forest.csl b/research-institute-for-nature-and-forest.csl
index 8a6a1f3560a..05cdb50d1aa 100644
--- a/research-institute-for-nature-and-forest.csl
+++ b/research-institute-for-nature-and-forest.csl
@@ -287,4 +287,3 @@
     </layout>
   </bibliography>
 </style>
-
diff --git a/revista-espanola-de-nutricion-humana-y-dietetica.csl b/revista-espanola-de-nutricion-humana-y-dietetica.csl
index f896ad029e9..d84d2796808 100644
--- a/revista-espanola-de-nutricion-humana-y-dietetica.csl
+++ b/revista-espanola-de-nutricion-humana-y-dietetica.csl
@@ -5,8 +5,8 @@
     <title>Revista Espanola de Nutricion Humana y Dietetica (Español)</title>
     <title-short>RENHYD</title-short>
     <id>http://www.zotero.org/styles/revista-espanola-de-nutricion-humana-y-dietetica</id>
-    <link rel="self" href="http://www.zotero.org/styles/revista-espanola-de-nutricion-humana-y-dietetica"/>
-    <link rel="template" href="http://www.zotero.org/styles/angiologia"/>
+    <link href="http://www.zotero.org/styles/revista-espanola-de-nutricion-humana-y-dietetica" rel="self"/>
+    <link href="http://www.zotero.org/styles/angiologia" rel="template"/>
     <category citation-format="numeric"/>
     <category field="medicine"/>
     <issn>2173-1292</issn>
@@ -61,7 +61,7 @@
     <choose>
       <if variable="issued">
         <date variable="issued">
-          <date-part name="year" form="long" range-delimiter="–"/>
+          <date-part name="year" form="long" range-delimiter="&#8211;"/>
         </date>
       </if>
       <else>
diff --git a/ucl-institute-of-education-harvard.csl b/ucl-institute-of-education-harvard.csl
index 8e19c052ee8..fa684f8ad3a 100644
--- a/ucl-institute-of-education-harvard.csl
+++ b/ucl-institute-of-education-harvard.csl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
diff --git a/universite-de-sherbrooke-histoire.csl b/universite-de-sherbrooke-histoire.csl
index c9099a8a812..492becc81d8 100644
--- a/universite-de-sherbrooke-histoire.csl
+++ b/universite-de-sherbrooke-histoire.csl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-CA" version="1.0" demote-non-dropping-particle="never">
   <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) and with EditPad Pro 7-->
-    <info>
+  <info>
     <title>Université de Sherbrooke - Histoire (Français - Canada)</title>
     <title-short>UdeS-Hist</title-short>
     <id>http://www.zotero.org/styles/universite-de-sherbrooke-histoire</id>
@@ -52,7 +52,7 @@
         <name-part name="family" text-case="uppercase"/>
       </name>
       <et-al font-style="italic"/>
-      <label form="short" prefix=", " />
+      <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="editor-chapter">
@@ -60,7 +60,7 @@
       <name sort-separator=" " delimiter=", " and="text" delimiter-precedes-last="never" form="long">
       </name>
       <et-al font-style="italic"/>
-      <label form="short" prefix=", " />
+      <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="translator">
@@ -96,17 +96,17 @@
   </macro>
   <macro name="translator-note">
     <names variable="translator">
-      <name form="long" delimiter=", " and="text" delimiter-precedes-last="never" prefix=", traduit par " >
+      <name form="long" delimiter=", " and="text" delimiter-precedes-last="never" prefix=", traduit par ">
       </name>
     </names>
   </macro>
   <macro name="title-chapter-complete-ref">
-        <group delimiter=" " >
-          <text variable="title" quotes="true" suffix="."/>
-          <text value="Dans" font-style="normal"/>
-          <text macro="editor-chapter" suffix=","/>
-          <text variable="container-title" font-style="italic"  suffix=". "/>
-        </group>
+    <group delimiter=" ">
+      <text variable="title" quotes="true" suffix="."/>
+      <text value="Dans" font-style="normal"/>
+      <text macro="editor-chapter" suffix=","/>
+      <text variable="container-title" font-style="italic" suffix=". "/>
+    </group>
   </macro>
   <macro name="title">
     <choose>
@@ -114,14 +114,14 @@
         <text variable="title" font-style="italic" suffix=". "/>
       </if>
       <else-if type="thesis" match="any">
-          <text variable="title" quotes="true" suffix=". "/>
+        <text variable="title" quotes="true" suffix=". "/>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
-        <group delimiter=" " >
+        <group delimiter=" ">
           <text variable="title" quotes="true" suffix=","/>
           <text value="dans" font-style="normal"/>
           <text macro="editor-chapter" suffix=","/>
-          <text variable="container-title" font-style="italic"  suffix=". "/>
+          <text variable="container-title" font-style="italic" suffix=". "/>
         </group>
       </else-if>
       <else-if type="article-journal">
@@ -169,7 +169,7 @@
         <text variable="title" quotes="true"/>
       </else>
     </choose>
-     <choose>
+    <choose>
       <if variable="translator">
         <text macro="translator"/>
       </if>
@@ -181,7 +181,7 @@
         <text variable="title" font-style="italic"/>
       </if>
       <else-if type="thesis" match="any">
-          <text variable="title" quotes="true"/>
+        <text variable="title" quotes="true"/>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
         <group delimiter=" ">
@@ -346,20 +346,20 @@
         </choose>
       </if>
       <else-if type="article-journal" match="any">
+        <choose>
+          <if is-numeric="volume">
+            <number variable="volume" prefix=", vol. "/>
             <choose>
-              <if is-numeric="volume">
-                <number variable="volume" prefix=", vol. "/>
-                <choose>
-                  <if is-numeric="issue">
-                    <text value=""/>
-                    <number variable="issue" prefix=", n° "/>
-                  </if>
-                </choose>
-              </if>
-              <else-if is-numeric="issue">
+              <if is-numeric="issue">
+                <text value=""/>
                 <number variable="issue" prefix=", n° "/>
-              </else-if>
+              </if>
             </choose>
+          </if>
+          <else-if is-numeric="issue">
+            <number variable="issue" prefix=", n° "/>
+          </else-if>
+        </choose>
         <choose>
           <if variable="issued">
             <date variable="issued" form="text" date-parts="year-month" prefix=", "/>
@@ -435,10 +435,10 @@
       <if variable="locator">
         <text macro="locator"/>
       </if>
-          <else-if variable="number-of-pages">
-            <text variable="number-of-pages" suffix=" "/>
-            <label variable="number-of-pages" form="short"/>            
-          </else-if>
+      <else-if variable="number-of-pages">
+        <text variable="number-of-pages" suffix=" "/>
+        <label variable="number-of-pages" form="short"/>
+      </else-if>
       <else>
         <group delimiter=" ">
           <label variable="page" form="short"/>
@@ -470,7 +470,7 @@
             <text term="edition" prefix=" "/>
           </if>
           <else>
-          	<text variable="edition" prefix=" "/>
+            <text variable="edition" prefix=" "/>
           </else>
         </choose>
       </if>
@@ -498,67 +498,66 @@
     </group>
   </macro>
   <macro name="source-biblio">
-   <group delimiter=", ">
-    <text variable="publisher-place"/>
-    <text variable="archive"/>
-    <text variable="archive_location"/>
-    <text variable="title" form="short" quotes="false"/>
-   </group>
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="archive"/>
+      <text variable="archive_location"/>
+      <text variable="title" form="short" quotes="false"/>
+    </group>
   </macro>
   <macro name="source-manuscrite">
-   <group delimiter=", ">
-    <text variable="archive"/>
-    <text variable="archive_location"/>
-    <text macro="author-note"/>
-    <text variable="title" form="short" quotes="true"/>
-   </group>
+    <group delimiter=", ">
+      <text variable="archive"/>
+      <text variable="archive_location"/>
+      <text macro="author-note"/>
+      <text variable="title" form="short" quotes="true"/>
+    </group>
     <choose>
       <if variable="number-of-pages">
-        <label variable="number-of-pages" form="short" prefix=", "/>            
+        <label variable="number-of-pages" form="short" prefix=", "/>
         <text variable="number-of-pages"/>
       </if>
     </choose>
-   <group delimiter=", ">
-    <date variable="issued" form="text" prefix=", "/>
-    <text macro="url"/>
-   </group>
+    <group delimiter=", ">
+      <date variable="issued" form="text" prefix=", "/>
+      <text macro="url"/>
+    </group>
   </macro>
   <macro name="carte-geo">
     <text macro="author-note"/>
     <choose>
-     <if variable="publisher">
+      <if variable="publisher">
         <text variable="title" font-style="italic" prefix=", "/>
         <text variable="scale" prefix=", "/>
-          <choose>
-            <if variable="original-date">
-              <date variable="original-date" form="text" date-parts="year-month-day" prefix=" (" suffix=")"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="collection-title">
-              <text value=" dans " font-style="normal" prefix=", "/>
-              <text variable="collection-title" font-style="italic"/>
-            </if>
-          </choose>
-          <text macro="place-and-publisher" prefix=", "/>
-          <text macro="date-pages-no-collection" prefix=", "/>
-          <text macro="url" prefix=", "/>
-     </if>
-     <else>
-       <group delimiter=", ">
-           <text macro="title" prefix=", "/>
-           <text variable="scale"/>
-           <date variable="issued" form="text"/>
-           <text variable="archive"/>
-           <text variable="archive_location"/>
-           <text macro="url"/>
-       </group>
-     </else>
+        <choose>
+          <if variable="original-date">
+            <date variable="original-date" form="text" date-parts="year-month-day" prefix=" (" suffix=")"/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="collection-title">
+            <text value=" dans " font-style="normal" prefix=", "/>
+            <text variable="collection-title" font-style="italic"/>
+          </if>
+        </choose>
+        <text macro="place-and-publisher" prefix=", "/>
+        <text macro="date-pages-no-collection" prefix=", "/>
+        <text macro="url" prefix=", "/>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <text macro="title" prefix=", "/>
+          <text variable="scale"/>
+          <date variable="issued" form="text"/>
+          <text variable="archive"/>
+          <text variable="archive_location"/>
+          <text macro="url"/>
+        </group>
+      </else>
     </choose>
   </macro>
-
   <citation name-form="long" and="text" sort-separator=", " delimiter-precedes-last="never" et-al-min="4" et-al-use-first="1">
-    <layout suffix="." delimiter=" ; ">
+    <layout suffix="." delimiter="&#160;; ">
       <choose>
         <if type="manuscript" match="any">
           <text macro="source-manuscrite"/>
@@ -603,11 +602,11 @@
           <group delimiter=", ">
             <text macro="author-note"/>
             <text macro="title-note"/>
-            <text macro="volume-or-medium"/>            
+            <text macro="volume-or-medium"/>
             <text macro="place-and-publisher"/>
           </group>
           <group delimiter=", ">
-           <text macro="date-pages-no-collection"/>
+            <text macro="date-pages-no-collection"/>
             <text macro="url"/>
           </group>
         </else>