diff --git a/african-zoology.csl b/african-zoology.csl
index 3402221a21..2e6af995c9 100644
--- a/african-zoology.csl
+++ b/african-zoology.csl
@@ -35,7 +35,7 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all"  sort-separator=" " initialize-with="" delimiter=", "/>
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", "/>
       <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
       <substitute>
         <names variable="editor"/>
@@ -128,7 +128,7 @@
             <group delimiter=" " prefix="(" suffix=")">
               <number variable="edition" form="ordinal"/>
               <text term="edition" form="short" strip-periods="true"/>
-            </group> 
+            </group>
           </if>
           <else>
             <text variable="edition" prefix=" (" suffix=")"/>
diff --git a/american-chemical-society-author-date.csl b/american-chemical-society-author-date.csl
index 2a0d59f84d..f7ee852bbe 100755
--- a/american-chemical-society-author-date.csl
+++ b/american-chemical-society-author-date.csl
@@ -168,7 +168,7 @@
     <layout suffix=".">
       <text macro="author" suffix=" "/>
       <choose>
-       <if type="article-journal review" match="any">
+        <if type="article-journal review" match="any">
           <group delimiter=" ">
             <text macro="title" suffix="."/>
             <text variable="container-title" font-style="italic" form="short"/>
diff --git a/american-chemical-society-page-first.csl b/american-chemical-society-page-first.csl
index 6a2fe970d5..fda46982cc 100755
--- a/american-chemical-society-page-first.csl
+++ b/american-chemical-society-page-first.csl
@@ -150,7 +150,7 @@
             </group>
           </group>
         </if>
-         <else-if type="article-magazine article-newspaper article" match="any">
+        <else-if type="article-magazine article-newspaper article" match="any">
           <group delimiter=" ">
             <text variable="container-title" font-style="italic" suffix="."/>
             <text macro="edition"/>
@@ -232,7 +232,7 @@
             </date>
           </group>
         </else-if>
-       <else>
+        <else>
           <group delimiter=", ">
             <group delimiter=". ">
               <text variable="title"/>
diff --git a/american-journal-of-neuroradiology.csl b/american-journal-of-neuroradiology.csl
index d7cde87d79..dfe0a17db3 100644
--- a/american-journal-of-neuroradiology.csl
+++ b/american-journal-of-neuroradiology.csl
@@ -202,7 +202,7 @@
                 </group>
               </else>
             </choose>
-          </group>        
+          </group>
         </else>
       </choose>
     </layout>
diff --git a/american-medical-association-alphabetical.csl b/american-medical-association-alphabetical.csl
index 79187a59ea..5e03c7891b 100644
--- a/american-medical-association-alphabetical.csl
+++ b/american-medical-association-alphabetical.csl
@@ -56,7 +56,7 @@
               <text variable="URL"/>
               <choose>
                 <if type="webpage">
-                  <date variable="issued" prefix="Published " form="text" />
+                  <date variable="issued" prefix="Published " form="text"/>
                 </if>
               </choose>
               <group>
diff --git a/american-medical-association-no-et-al.csl b/american-medical-association-no-et-al.csl
index 89ade65443..dc095a0c5c 100644
--- a/american-medical-association-no-et-al.csl
+++ b/american-medical-association-no-et-al.csl
@@ -56,7 +56,7 @@
               <text variable="URL"/>
               <choose>
                 <if type="webpage">
-                  <date variable="issued" prefix="Published " form="text" />
+                  <date variable="issued" prefix="Published " form="text"/>
                 </if>
               </choose>
               <group>
diff --git a/american-medical-association-no-url.csl b/american-medical-association-no-url.csl
index cbaac8bcf4..3eeaa99677 100644
--- a/american-medical-association-no-url.csl
+++ b/american-medical-association-no-url.csl
@@ -92,10 +92,10 @@
       <choose>
         <if type="bill book graphic legislation motion_picture report song" match="any">
           <group suffix="." prefix=" " delimiter=" ">
-	    <group delimiter=" ">
+            <group delimiter=" ">
               <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
               <text variable="volume" suffix="."/>
-	    </group>
+            </group>
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
@@ -112,10 +112,10 @@
             <text term="in" text-case="capitalize-first" suffix=":"/>
             <text macro="editor"/>
             <text variable="container-title" font-style="italic" suffix="." text-case="title"/>
-	    <group delimiter=" ">
+            <group delimiter=" ">
               <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
               <text variable="volume" suffix="."/>
-	    </group>
+            </group>
             <text macro="edition"/>
             <text variable="collection-title" suffix="."/>
             <group suffix=".">
diff --git a/american-medical-association.csl b/american-medical-association.csl
index cccb66b21b..0cfd9461b7 100644
--- a/american-medical-association.csl
+++ b/american-medical-association.csl
@@ -56,7 +56,7 @@
               <text variable="URL"/>
               <choose>
                 <if type="webpage">
-                  <date variable="issued" prefix="Published " form="text" />
+                  <date variable="issued" prefix="Published " form="text"/>
                 </if>
               </choose>
               <group>
diff --git a/biopolymers.csl b/biopolymers.csl
index 1fe833b9fb..4e793d3a67 100644
--- a/biopolymers.csl
+++ b/biopolymers.csl
@@ -5,8 +5,6 @@
     <id>http://www.zotero.org/styles/biopolymers</id>
     <link href="http://www.zotero.org/styles/biopolymers" rel="self"/>
     <link href="http://www.zotero.org/styles/american-chemical-society" rel="template"/>
-    <issn>0006-3525</issn>
-    <eissn>1097-0282</eissn>
     <link href="http://onlinelibrary.wiley.com/journal/10.1002/%28ISSN%291097-0282/homepage/ForAuthors.html" rel="documentation"/>
     <author>
       <name>Marcus Fislage</name>
@@ -14,6 +12,8 @@
     </author>
     <category citation-format="numeric"/>
     <category field="chemistry"/>
+    <issn>0006-3525</issn>
+    <eissn>1097-0282</eissn>
     <summary>Biopoymers.</summary>
     <updated>2015-11-27T15:13:17+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
@@ -198,9 +198,9 @@
               <text macro="publisher"/>
               <text macro="issued"/>
             </group>
-              <text macro="volume"/>
-              <text macro="pages"/>
-            </group>
+            <text macro="volume"/>
+            <text macro="pages"/>
+          </group>
         </else-if>
         <else-if type="webpage">
           <group delimiter=" ">
diff --git a/changer-d-epoque.csl b/changer-d-epoque.csl
index c9176991b2..55f3994d47 100644
--- a/changer-d-epoque.csl
+++ b/changer-d-epoque.csl
@@ -1,365 +1,365 @@
 <?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="fr-FR" page-range-format="expanded">
-    <info>
-      <title>Changer d'époque (French)</title>
-      <id>http://www.zotero.org/styles/changer-d-epoque</id>
-      <link href="http://www.zotero.org/styles/changer-d-epoque" rel="self"/>
-      <link href="http://purh.univ-rouen.fr/taxonomy/term/2" rel="documentation"/>
-      <link href="http://www.zotero.org/styles/revue-archeologique" rel="template"/>
-      <author>
-        <name>Nicolas Monteix</name>
-        <email>nicolas.monteix@univ-rouen.fr</email>
-      </author>
-      <category citation-format="note"/>
-      <category field="history"/>
-      <category field="anthropology"/>
-      <issn>2111-6911</issn>
-      <summary>Feuille de style pour la collection "Changer d'époque" des Presses universitaires de Rouen et du Havre (PURH)</summary>
-      <updated>2015-12-02T04:18:39+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="fr">
-      <terms>
-        <term name="editor" form="short">
-          <single>dir.</single>
-          <multiple>dir.</multiple>
-        </term>
-        <term name="in">dans</term>
-        <term name="online">mis en ligne le</term>
-        <term name="anonymous">anonyme</term>
-        <term name="anonymous" form="short">anon.</term>
-        <term name="no date">sans date</term>
-        <term name="no date" form="short">s. d.</term>
-        <term name="cited">op. cit.</term>
-      </terms>
-    </locale>
-    <macro name="author">
-      <names variable="author" delimiter=", ">
-        <name sort-separator=", " delimiter=", "/>
-        <et-al font-style="italic"/>
-        <substitute>
-          <text macro="editor"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="editor">
-      <names variable="editor" delimiter=", ">
-        <name sort-separator=", " delimiter=", "/>
-        <et-al font-style="italic"/>
-        <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-      </names>
-    </macro>
-    <macro name="author-bib">
-      <names variable="author" delimiter=", ">
-        <name sort-separator=" " delimiter=", " name-as-sort-order="all">
-          <name-part name="family" font-variant="small-caps"/>
-        </name>
-        <et-al font-style="italic"/>
-        <substitute>
-          <text macro="editor-bib"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="editor-bib">
-      <names variable="editor" delimiter=", ">
-        <name sort-separator=" " delimiter=", " name-as-sort-order="all">
-          <name-part name="family" font-variant="small-caps"/>
-        </name>
-        <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-      </names>
-    </macro>
-    <macro name="pages">
-      <group delimiter=" ">
-        <label variable="page" form="short"/>
-        <text variable="page"/>
+  <info>
+    <title>Changer d'époque (French)</title>
+    <id>http://www.zotero.org/styles/changer-d-epoque</id>
+    <link href="http://www.zotero.org/styles/changer-d-epoque" rel="self"/>
+    <link href="http://www.zotero.org/styles/revue-archeologique" rel="template"/>
+    <link href="http://purh.univ-rouen.fr/taxonomy/term/2" rel="documentation"/>
+    <author>
+      <name>Nicolas Monteix</name>
+      <email>nicolas.monteix@univ-rouen.fr</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="history"/>
+    <category field="anthropology"/>
+    <issn>2111-6911</issn>
+    <summary>Feuille de style pour la collection "Changer d'époque" des Presses universitaires de Rouen et du Havre (PURH)</summary>
+    <updated>2015-12-02T04:18:39+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="fr">
+    <terms>
+      <term name="editor" form="short">
+        <single>dir.</single>
+        <multiple>dir.</multiple>
+      </term>
+      <term name="in">dans</term>
+      <term name="online">mis en ligne le</term>
+      <term name="anonymous">anonyme</term>
+      <term name="anonymous" form="short">anon.</term>
+      <term name="no date">sans date</term>
+      <term name="no date" form="short">s.&#160;d.</term>
+      <term name="cited">op. cit.</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author" delimiter=", ">
+      <name sort-separator=", " delimiter=", "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <text macro="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name sort-separator=", " delimiter=", "/>
+      <et-al font-style="italic"/>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author-bib">
+    <names variable="author" delimiter=", ">
+      <name sort-separator=" " delimiter=", " name-as-sort-order="all">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+      <et-al font-style="italic"/>
+      <substitute>
+        <text macro="editor-bib"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor-bib">
+    <names variable="editor" delimiter=", ">
+      <name sort-separator=" " delimiter=", " name-as-sort-order="all">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="pages">
+    <group delimiter="&#160;">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group>
+      <text term="accessed" suffix="&#160;"/>
+      <date variable="accessed" form="numeric">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="collection">
+    <group delimiter=", ">
+      <text variable="collection-title" quotes="true"/>
+      <group delimiter="&#160;">
+        <text term="issue" form="short"/>
+        <text variable="collection-number"/>
       </group>
-    </macro>
-    <macro name="access">
-      <group>
-        <text term="accessed" suffix=" "/>
-        <date variable="accessed" form="numeric">
-          <date-part name="day"/>
-          <date-part name="month"/>
+    </group>
+  </macro>
+  <macro name="locator">
+    <group delimiter="&#160;">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="locator-cit">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper entry-dictionary entry-encyclopedia chapter paper-conference" match="any">
+        <group delimiter="&#160;" prefix="en particulier ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </if>
+      <else>
+        <text macro="locator"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if type="webpage" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="container-title" match="none">
+        <text variable="title" font-style="italic"/>
+      </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="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
           <date-part name="year"/>
         </date>
-      </group>
-    </macro>
-    <macro name="collection">
-      <group delimiter=", ">
-        <text variable="collection-title" quotes="true"/>
-        <group delimiter=" ">
-          <text term="issue" form="short"/>
-          <text variable="collection-number"/>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" text-case="lowercase"/>
         </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="book">
+    <group delimiter=", ">
+      <text macro="title"/>
+      <text macro="edition"/>
+      <text macro="collection"/>
+      <text macro="publisher"/>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="thesis">
+    <group delimiter=", ">
+      <text macro="title" font-style="italic"/>
+      <text variable="genre"/>
+      <text variable="publisher" prefix="soutenue à l'"/>
+      <text macro="year-date"/>
+      <text variable="number-of-pages" suffix=" p. (dactyl.)"/>
+    </group>
+  </macro>
+  <macro name="article">
+    <group delimiter=", ">
+      <text macro="title" quotes="true"/>
+      <group delimiter=" ">
+        <text term="in"/>
+        <text variable="container-title" font-style="italic"/>
       </group>
-    </macro>
-    <macro name="locator">
-      <group delimiter=" ">
-        <label variable="locator" form="short"/>
-        <text variable="locator"/>
-      </group>
-    </macro>
-    <macro name="locator-cit">
-      <choose>
-        <if type="article-journal article-magazine article-newspaper entry-dictionary entry-encyclopedia chapter paper-conference" match="any">
-          <group delimiter=" " prefix="en particulier ">
-            <label variable="locator" form="short"/>
-            <text variable="locator"/>
-          </group>
-        </if>
-        <else>
-          <text macro="locator"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="title">
-      <choose>
-        <if type="book" match="any">
-          <text variable="title" font-style="italic"/>
-        </if>
-        <else-if type="webpage" match="any">
-          <text variable="title"/>
-        </else-if>
-        <else-if variable="container-title" match="none">
-          <text variable="title" font-style="italic"/>
-        </else-if>
-        <else>
-          <text variable="title"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="publisher">
-      <group delimiter=", ">
-        <text variable="publisher-place"/>
-        <text variable="publisher"/>
+      <group delimiter="&#160;">
+        <label variable="volume" form="short"/>
+        <text variable="volume"/>
       </group>
-    </macro>
-    <macro name="year-date">
-      <choose>
-        <if variable="issued">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </if>
-        <else>
-          <text term="no date" form="short"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="edition">
-      <choose>
-        <if is-numeric="edition">
-          <group delimiter=" ">
-            <number variable="edition" form="ordinal"/>
-            <text term="edition" form="short" text-case="lowercase"/>
-          </group>
-        </if>
-        <else>
-          <text variable="edition"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="book">
-      <group delimiter=", ">
-        <text macro="title"/>
-        <text macro="edition"/>
-        <text macro="collection"/>
-        <text macro="publisher"/>
-        <text macro="year-date"/>
+      <group delimiter="&#160;">
+        <label variable="issue" form="short"/>
+        <text variable="issue"/>
       </group>
-    </macro>
-    <macro name="thesis">
-      <group delimiter=", ">
-        <text macro="title" font-style="italic"/>
-        <text variable="genre"/>
-        <text variable="publisher" prefix="soutenue à l'"/>
-        <text macro="year-date"/>
-        <text variable="number-of-pages" suffix=" p. (dactyl.)"/>
+      <text macro="year-date"/>
+      <group delimiter=" ">
+        <text variable="URL"/>
+        <text macro="access" prefix=" (" suffix=")"/>
       </group>
-    </macro>
-    <macro name="article">
-      <group delimiter=", ">
-        <text macro="title" quotes="true"/>
-        <group delimiter=" ">
-          <text term="in"/>
-          <text variable="container-title" font-style="italic"/>
-        </group>
-        <group delimiter=" ">
-          <label variable="volume" form="short"/>
-          <text variable="volume"/>
-        </group>
-        <group delimiter=" ">
-          <label variable="issue" form="short"/>
-          <text variable="issue"/>
-        </group>
-        <text macro="year-date"/>
-        <group delimiter=" ">
-          <text variable="URL"/>
-          <text macro="access" prefix=" (" suffix=")" />
-        </group>
-        <text macro="pages"/>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <macro name="dictionary">
+    <group delimiter=", ">
+      <text macro="title" quotes="true"/>
+      <group delimiter=" ">
+        <text term="in"/>
+        <text variable="container-title" font-style="italic"/>
       </group>
-    </macro>
-    <macro name="dictionary">
-      <group delimiter=", ">
-        <text macro="title" quotes="true"/>
-        <group delimiter=" ">
-          <text term="in"/>
-          <text variable="container-title" font-style="italic"/>
-        </group>
-        <group delimiter=" ">
-          <label variable="volume" form="short"/>
-          <text variable="volume"/>
-        </group>
-        <text macro="year-date"/>
-        <text macro="pages"/>
+      <group delimiter="&#160;">
+        <label variable="volume" form="short"/>
+        <text variable="volume"/>
       </group>
-    </macro>
-    <macro name="chapter">
-      <text macro="title" quotes="true" suffix=", "/>
-      <group>
-        <group delimiter=" ">
-          <text term="in"/>
-          <text macro="editor" suffix=", "/>
-        </group>
-        <text variable="container-title" font-style="italic"/>
-        <text macro="collection" prefix=" "/>
-        <text macro="publisher" prefix=", " suffix=", "/>
-        <text macro="year-date" suffix=", "/>
-        <text macro="pages"/>
+      <text macro="year-date"/>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <macro name="chapter">
+    <text macro="title" quotes="true" suffix=", "/>
+    <group>
+      <group delimiter=" ">
+        <text term="in"/>
+        <text macro="editor" suffix=", "/>
       </group>
-    </macro>
-    <macro name="web">
-      <group delimiter=", ">
-        <text macro="title" quotes="true"/>
-        <text variable="container-title" font-style="italic"/>
-        <text macro="year-date"/>
-        <group delimiter=" ">
-          <text variable="URL"/>
-          <text macro="access" prefix=" (" suffix=")" />
-        </group>
+      <text variable="container-title" font-style="italic"/>
+      <text macro="collection" prefix=" "/>
+      <text macro="publisher" prefix=", " suffix=", "/>
+      <text macro="year-date" suffix=", "/>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <macro name="web">
+    <group delimiter=", ">
+      <text macro="title" quotes="true"/>
+      <text variable="container-title" font-style="italic"/>
+      <text macro="year-date"/>
+      <group delimiter=" ">
+        <text variable="URL"/>
+        <text macro="access" prefix=" (" suffix=")"/>
       </group>
-    </macro>
-    <citation et-al-min="4" et-al-use-first="1" collapse="year">
-      <layout delimiter=" ; ">
-        <choose>
-          <if position="ibid-with-locator">
-            <group delimiter=", ">
-              <text term="ibid" text-case="capitalize-first" font-style="italic"/>
-              <text macro="locator"/>
-            </group>
-          </if>
-          <else-if position="ibid">
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" collapse="year">
+    <layout delimiter="&#160;; ">
+      <choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
             <text term="ibid" text-case="capitalize-first" font-style="italic"/>
-          </else-if>
-          <else-if position="subsequent">
-            <group delimiter=", ">
-              <text macro="author"/>
-              <text variable="title" form="short" font-style="italic"/>
-              <group delimiter=" ">
-                <text term="cited" font-style="italic"/>
-                <text value="supra" font-style="italic"/>
-                <group delimiter=" ">
-                  <text term="note" form="short"/>
-                  <text variable="first-reference-note-number"/>
-                </group>
+            <text macro="locator"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" text-case="capitalize-first" font-style="italic"/>
+        </else-if>
+        <else-if position="subsequent">
+          <group delimiter=", ">
+            <text macro="author"/>
+            <text variable="title" form="short" font-style="italic"/>
+            <group delimiter=" ">
+              <text term="cited" font-style="italic"/>
+              <text value="supra" font-style="italic"/>
+              <group delimiter="&#160;">
+                <text term="note" form="short"/>
+                <text variable="first-reference-note-number"/>
               </group>
-              <text macro="locator"/>
             </group>
-          </else-if>
-          <else>
-            <text macro="author" suffix=", "/>
-            <choose>
-              <if type="thesis">
-                <text macro="thesis"/>
-              </if>
-              <else-if type="article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
-                <text macro="article"/>
-              </else-if>
-              <else-if type="book graphic" match="any">
-                <text macro="book"/>
-              </else-if>
-              <else-if type="entry-dictionary entry-encyclopedia" match="any">
-                <text macro="dictionary"/>
-              </else-if>
-              <else-if type="chapter paper-conference" match="any">
-                <text macro="chapter"/>
-              </else-if>
-              <else-if type="webpage post-weblog" match="any">
-                <text macro="web"/>
-              </else-if>
-            </choose>
-            <text macro="locator-cit" prefix=", "/>
-          </else>
-        </choose>
-      </layout>
-    </citation>
-    <bibliography subsequent-author-substitute="—">
-      <sort>
-        <key macro="author"/>
-        <key variable="issued"/>
-        <key variable="page-first"/>
-        <key variable="title"/>
-      </sort>
-      <layout suffix=".">
-        <group display="block">
-          <group>
-            <text macro="author-bib" suffix=", "/>
-            <choose>
-              <if type="thesis">
-                <text macro="thesis"/>
-              </if>
-              <else-if type="article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
-                <text macro="article"/>
-              </else-if>
-              <else-if type="webpage post-weblog" match="any">
-                <text macro="web"/>
-              </else-if>
-              <else-if type="book graphic" match="any">
-                <group delimiter=", ">
-                  <text macro="title"/>
-                  <text macro="edition"/>
-                  <text macro="collection"/>
-                  <text macro="publisher"/>
-                  <text macro="year-date"/>
+            <text macro="locator"/>
+          </group>
+        </else-if>
+        <else>
+          <text macro="author" suffix=", "/>
+          <choose>
+            <if type="thesis">
+              <text macro="thesis"/>
+            </if>
+            <else-if type="article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
+              <text macro="article"/>
+            </else-if>
+            <else-if type="book graphic" match="any">
+              <text macro="book"/>
+            </else-if>
+            <else-if type="entry-dictionary entry-encyclopedia" match="any">
+              <text macro="dictionary"/>
+            </else-if>
+            <else-if type="chapter paper-conference" match="any">
+              <text macro="chapter"/>
+            </else-if>
+            <else-if type="webpage post-weblog" match="any">
+              <text macro="web"/>
+            </else-if>
+          </choose>
+          <text macro="locator-cit" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography subsequent-author-substitute="&#8212;">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+      <key variable="page-first"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group display="block">
+        <group>
+          <text macro="author-bib" suffix=", "/>
+          <choose>
+            <if type="thesis">
+              <text macro="thesis"/>
+            </if>
+            <else-if type="article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
+              <text macro="article"/>
+            </else-if>
+            <else-if type="webpage post-weblog" match="any">
+              <text macro="web"/>
+            </else-if>
+            <else-if type="book graphic" match="any">
+              <group delimiter=", ">
+                <text macro="title"/>
+                <text macro="edition"/>
+                <text macro="collection"/>
+                <text macro="publisher"/>
+                <text macro="year-date"/>
+              </group>
+            </else-if>
+            <else-if type="entry-dictionary entry-encyclopedia" match="any">
+              <group delimiter=", ">
+                <text macro="title" quotes="true"/>
+                <group delimiter=" ">
+                  <text term="in"/>
+                  <text variable="container-title" font-style="italic"/>
                 </group>
-              </else-if>
-              <else-if type="entry-dictionary entry-encyclopedia" match="any">
-                <group delimiter=", ">
-                  <text macro="title" quotes="true"/>
-                  <group delimiter=" ">
-                    <text term="in"/>
-                    <text variable="container-title" font-style="italic"/>
-                  </group>
-                  <group delimiter=" ">
-                    <label variable="volume" form="short"/>
-                    <text variable="volume"/>
-                  </group>
-                  <text macro="year-date"/>
-                  <text macro="pages"/>
+                <group delimiter="&#160;">
+                  <label variable="volume" form="short"/>
+                  <text variable="volume"/>
                 </group>
-              </else-if>
-              <else-if type="chapter paper-conference" match="any">
-                <text macro="title" quotes="true" suffix=", "/>
-                <group delimiter=", ">
-                  <group delimiter=" ">
-                    <text term="in"/>
-                    <text macro="editor"/>
-                  </group>
-                  <text variable="container-title" font-style="italic"/>
-                  <text macro="collection"/>
-                  <group delimiter=" ">
-                    <text term="volume" form="short"/>
-                    <text variable="volume"/>
-                  </group>
-                  <text macro="publisher"/>
-                  <text macro="year-date"/>
-                  <text macro="pages"/>
+                <text macro="year-date"/>
+                <text macro="pages"/>
+              </group>
+            </else-if>
+            <else-if type="chapter paper-conference" match="any">
+              <text macro="title" quotes="true" suffix=", "/>
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text term="in"/>
+                  <text macro="editor"/>
                 </group>
-              </else-if>
-            </choose>
-          </group>
+                <text variable="container-title" font-style="italic"/>
+                <text macro="collection"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+                <text macro="publisher"/>
+                <text macro="year-date"/>
+                <text macro="pages"/>
+              </group>
+            </else-if>
+          </choose>
         </group>
-      </layout>
-    </bibliography>
-  </style>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/chemical-and-pharmaceutical-bulletin.csl b/chemical-and-pharmaceutical-bulletin.csl
index 864def1eac..e281db77bd 100644
--- a/chemical-and-pharmaceutical-bulletin.csl
+++ b/chemical-and-pharmaceutical-bulletin.csl
@@ -2,7 +2,7 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>Chemical and Pharmaceutical Bulletin</title>
-	<title-short>Chem. Pharm. Bull.</title-short>
+    <title-short>Chem. Pharm. Bull.</title-short>
     <id>http://www.zotero.org/styles/chemical-and-pharmaceutical-bulletin</id>
     <link href="http://www.zotero.org/styles/chemical-and-pharmaceutical-bulletin" rel="self"/>
     <link href="http://cpb.pharm.or.jp/document/inst_e.pdf" rel="documentation"/>
diff --git a/chicago-author-date.csl b/chicago-author-date.csl
index 33972a8ad7..54bfbe378d 100644
--- a/chicago-author-date.csl
+++ b/chicago-author-date.csl
@@ -116,7 +116,7 @@
         <substitute>
           <names variable="editor"/>
           <names variable="translator"/>
-          <names variable="director"/>          
+          <names variable="director"/>
           <text macro="substitute-title"/>
           <text macro="title"/>
         </substitute>
@@ -130,7 +130,7 @@
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-        <names variable="director"/>          
+        <names variable="director"/>
         <text macro="substitute-title"/>
         <text macro="title"/>
       </substitute>
diff --git a/chimia.csl b/chimia.csl
index 979fe6f1e2..4ea953e50d 100644
--- a/chimia.csl
+++ b/chimia.csl
@@ -18,7 +18,7 @@
     <updated>2015-10-10T16:30: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>
-  <!-- MACROS, sorted alphabetically -->  
+  <!-- MACROS, sorted alphabetically -->
   <!-- author -->
   <macro name="author">
     <names variable="author">
@@ -30,7 +30,6 @@
       </substitute>
     </names>
   </macro>
-  
   <!-- computer program -->
   <macro name="computerprogram">
     <group delimiter=", ">
@@ -44,7 +43,6 @@
     </group>
     <text macro="doi" prefix=", "/>
   </macro>
-  
   <!-- DOI -->
   <macro name="doi">
     <choose>
@@ -53,7 +51,6 @@
       </if>
     </choose>
   </macro>
-  
   <!-- edition -->
   <macro name="edition">
     <group delimiter=" ">
@@ -61,7 +58,6 @@
       <text term="edition" form="short"/>
     </group>
   </macro>
-  
   <!-- editor -->
   <macro name="editor">
     <group delimiter=" ">
@@ -71,7 +67,6 @@
       </names>
     </group>
   </macro>
-  
   <!-- full-accessed -->
   <macro name="full-accessed">
     <date variable="accessed" prefix="accessed " delimiter=" ">
@@ -80,7 +75,6 @@
       <date-part name="year" font-weight="bold"/>
     </date>
   </macro>
-  
   <!-- publisher -->
   <macro name="publisher">
     <group delimiter=", ">
@@ -88,7 +82,6 @@
       <text variable="publisher-place" text-case="title"/>
     </group>
   </macro>
-  
   <!-- pages -->
   <macro name="pages">
     <choose>
@@ -101,7 +94,6 @@
       </else>
     </choose>
   </macro>
-  
   <!-- program-version -->
   <macro name="program-version">
     <choose>
@@ -116,7 +108,6 @@
       </else>
     </choose>
   </macro>
-  
   <!-- thesis-number -->
   <macro name="thesis-number">
     <choose>
@@ -138,7 +129,6 @@
       </else-if>
     </choose>
   </macro>
-  
   <!-- thesis-type -->
   <macro name="thesis-type">
     <choose>
@@ -150,7 +140,6 @@
       </else>
     </choose>
   </macro>
-  
   <!-- volume -->
   <macro name="volume">
     <group delimiter=" ">
@@ -162,7 +151,6 @@
       <text variable="volume"/>
     </group>
   </macro>
-  
   <!-- year-date -->
   <macro name="year-date">
     <group font-weight="bold">
@@ -176,7 +164,6 @@
     </group>
   </macro>
   <!-- END MACROS -->
-  
   <!-- CITATION -->
   <citation collapse="citation-number">
     <sort>
@@ -186,7 +173,6 @@
       <text variable="citation-number"/>
     </layout>
   </citation>
-  
   <!-- BIBLIOGRAPHY -->
   <bibliography entry-spacing="0" second-field-align="flush">
     <layout suffix=".">
@@ -217,7 +203,7 @@
             <else>
               <text macro="author" suffix=", "/>
               <group delimiter=", ">
-                <text variable="title" prefix="‘" suffix="’" />
+                <text variable="title" prefix="‘" suffix="’"/>
                 <text macro="publisher"/>
                 <text macro="year-date"/>
               </group>
@@ -231,7 +217,7 @@
           <group delimiter=", ">
             <group delimiter=" ">
               <text term="in"/>
-              <text variable="container-title" text-case="title" prefix="‘" suffix="’" />
+              <text variable="container-title" text-case="title" prefix="‘" suffix="’"/>
             </group>
             <text macro="volume" font-style="italic"/>
             <text macro="edition"/>
@@ -289,12 +275,11 @@
         <else-if type="manuscript" match="any">
           <text macro="author" suffix=", "/>
           <group delimiter=", ">
-            <text variable="title" prefix="‘" suffix="’" />
+            <text variable="title" prefix="‘" suffix="’"/>
             <text macro="publisher"/>
             <text macro="year-date"/>
           </group>
         </else-if>
-        
         <!-- anything else: 
           article-magazine
           article-newspaper
diff --git a/collection-de-l-ecole-francaise-de-rome-full-note.csl b/collection-de-l-ecole-francaise-de-rome-full-note.csl
index b015527b43..c4fe6d2841 100644
--- a/collection-de-l-ecole-francaise-de-rome-full-note.csl
+++ b/collection-de-l-ecole-francaise-de-rome-full-note.csl
@@ -1,304 +1,248 @@
 <?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="fr-FR" page-range-format="expanded" initialize-with-hyphen="true">
-    <info>
-      <title>Collection de l'Ecole française de Rome (full note, French)</title>
-      <id>http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-full-note</id>
-      <link href="http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-full-note" rel="self"/>
-      <link href="http://www.publications.efrome.it/opencms/export/sites/efrome/documenti/norme_fr.pdf" rel="documentation"/>
-      <link href="http://www.zotero.org/styles/revue-archeologique" rel="template"/>
-      <author>
-        <name>Nicolas Monteix</name>
-        <email>nicolas.monteix@univ-rouen.fr</email>
-      </author>
-      <category citation-format="note"/>
-      <category field="history"/>
-      <category field="anthropology"/>
-      <issn>0223-5099</issn>
-      <summary>Feuille de style pour la Collection de l'Ecole française de Rome. Les références bibliographiques sont intégralement insérées en notes sans généralisation de l'abréviation</summary>
-      <updated>2015-12-06T04:18:39+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="fr">
-      <terms>
-        <term name="editor" form="short">
-          <single>dir.</single>
-          <multiple>dir.</multiple>
-        </term>
-        <term name="paragraph">§</term>
-        <term name="in">dans</term>
-        <term name="online">mis en ligne le</term>
-        <term name="anonymous">anonyme</term>
-        <term name="anonymous" form="short">anon.</term>
-        <term name="no date">sans date</term>
-        <term name="no date" form="short">s. d.</term>
-        <term name="cited">op. cit.</term>
-      </terms>
-    </locale>
-    <macro name="author">
-      <names variable="author" delimiter=", ">
-        <name sort-separator=", " delimiter=", " initialize-with="."/>
-        <et-al font-style="italic"/>
-        <substitute>
-          <text macro="editor"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="editor">
-      <names variable="editor" delimiter=", ">
-        <name sort-separator=", " delimiter=", " initialize-with="."/>
-        <et-al font-style="italic"/>
-        <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-      </names>
-    </macro>
-    <macro name="author-short">
-      <names variable="author" delimiter=", ">
-        <name form="short" et-al-min="3" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
-        <et-al font-style="italic"/>
-        <substitute>
-          <text macro="editor-short"/>
-          <text variable="title" form="short"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="editor-short">
-      <names variable="editor">
-        <name form="short" et-al-min="4" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
-        <et-al font-style="italic"/>
-        <substitute>
-          <names variable="container-author"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="pages">
-      <group delimiter=" ">
-        <label variable="page" form="short"/>
-        <text variable="page"/>
-      </group>
-    </macro>
-    <macro name="access">
-      <group>
-        <text term="accessed" suffix=" "/>
-        <date variable="accessed" form="numeric">
-          <date-part name="day"/>
-          <date-part name="month"/>
+  <info>
+    <title>Collection de l'Ecole française de Rome (full note, French)</title>
+    <id>http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-full-note</id>
+    <link href="http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-full-note" rel="self"/>
+    <link href="http://www.zotero.org/styles/revue-archeologique" rel="template"/>
+    <link href="http://www.publications.efrome.it/opencms/export/sites/efrome/documenti/norme_fr.pdf" rel="documentation"/>
+    <author>
+      <name>Nicolas Monteix</name>
+      <email>nicolas.monteix@univ-rouen.fr</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="history"/>
+    <category field="anthropology"/>
+    <issn>0223-5099</issn>
+    <summary>Feuille de style pour la Collection de l'Ecole française de Rome. Les références bibliographiques sont intégralement insérées en notes sans généralisation de l'abréviation</summary>
+    <updated>2015-12-06T04:18:39+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="fr">
+    <terms>
+      <term name="editor" form="short">
+        <single>dir.</single>
+        <multiple>dir.</multiple>
+      </term>
+      <term name="paragraph">§</term>
+      <term name="in">dans</term>
+      <term name="online">mis en ligne le</term>
+      <term name="anonymous">anonyme</term>
+      <term name="anonymous" form="short">anon.</term>
+      <term name="no date">sans date</term>
+      <term name="no date" form="short">s.&#160;d.</term>
+      <term name="cited">op. cit.</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author" delimiter=", ">
+      <name sort-separator=", " delimiter=", " initialize-with="."/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <text macro="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name sort-separator=", " delimiter=", " initialize-with="."/>
+      <et-al font-style="italic"/>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author" delimiter=", ">
+      <name form="short" et-al-min="3" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <text macro="editor-short"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor-short">
+    <names variable="editor">
+      <name form="short" et-al-min="4" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="container-author"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="pages">
+    <group delimiter="&#160;">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group>
+      <text term="accessed" suffix="&#160;"/>
+      <date variable="accessed" form="numeric">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="collection">
+    <group delimiter=", " prefix="(" suffix=")">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="locator">
+    <group delimiter="&#160;">
+      <label variable="locator" form="short"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="locator-cit">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper entry-dictionary entry-encyclopedia chapter paper-conference" match="any">
+        <group delimiter="&#160;" prefix="en partic. ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
+      </if>
+      <else>
+        <text macro="locator"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if type="webpage" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="container-title" match="none">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place"/>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
           <date-part name="year"/>
         </date>
-      </group>
-    </macro>
-    <macro name="collection">
-      <group delimiter=", " prefix="(" suffix=")">
-        <text variable="collection-title"/>
-        <text variable="collection-number"/>
-      </group>
-    </macro>
-    <macro name="locator">
-      <group delimiter=" ">
-        <label variable="locator" form="short"/>
-        <text variable="locator"/>
-      </group>
-    </macro>
-    <macro name="locator-cit">
-      <choose>
-        <if type="article-journal article-magazine article-newspaper entry-dictionary entry-encyclopedia chapter paper-conference" match="any">
-          <group delimiter=" " prefix="en partic. ">
-            <label variable="locator" form="short"/>
-            <text variable="locator"/>
-          </group>
-        </if>
-        <else>
-          <text macro="locator"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="title">
-      <choose>
-        <if type="book" match="any">
-          <text variable="title" font-style="italic"/>
-        </if>
-        <else-if type="webpage" match="any">
-          <text variable="title"/>
-        </else-if>
-        <else-if variable="container-title" match="none">
-          <text variable="title" font-style="italic"/>
-        </else-if>
-        <else>
-          <text variable="title"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="publisher">
-      <text variable="publisher-place"/>
-    </macro>
-    <macro name="year-date">
-      <choose>
-        <if variable="issued">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </if>
-        <else>
-          <text term="no date" form="short"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="edition">
-      <choose>
-        <if is-numeric="edition">
-          <group delimiter=" ">
-            <number variable="edition" form="ordinal"/>
-            <text term="edition" form="short" text-case="lowercase"/>
-          </group>
-        </if>
-        <else>
-          <text variable="edition"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="thesis">
-      <group prefix=" " delimiter=", ">
-        <text macro="title" font-style="italic"/>
-        <text variable="genre"/>
-        <text variable="publisher"/>
-        <text macro="year-date"/>
-      </group>
-    </macro>
-    <macro name="articles">
-      <group delimiter=", ">
-        <text macro="title" quotes="true"/>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
         <group delimiter=" ">
-          <text term="in"/>
-          <text variable="container-title" font-style="italic"/>
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" text-case="lowercase"/>
         </group>
-        <text variable="volume"/>
-        <text variable="issue"/>
-        <group delimiter=" ">
-          <text macro="year-date"/>
-          <group prefix="(" suffix=")" delimiter=", ">
-            <text variable="URL"/>
-            <text macro="access"/>
-          </group>
-        </group>
-        <text macro="pages"/>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="thesis">
+    <group prefix=" " delimiter=", ">
+      <text macro="title" font-style="italic"/>
+      <text variable="genre"/>
+      <text variable="publisher"/>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="articles">
+    <group delimiter=", ">
+      <text macro="title" quotes="true"/>
+      <group delimiter=" ">
+        <text term="in"/>
+        <text variable="container-title" font-style="italic"/>
       </group>
-    </macro>
-    <macro name="book">
-      <group delimiter=", ">
-        <text macro="title"/>
-        <text macro="edition"/>
-        <text macro="publisher"/>
-        <group delimiter=" ">
-          <text macro="year-date"/>
-          <text macro="collection"/>
+      <text variable="volume"/>
+      <text variable="issue"/>
+      <group delimiter=" ">
+        <text macro="year-date"/>
+        <group prefix="(" suffix=")" delimiter=", ">
+          <text variable="URL"/>
+          <text macro="access"/>
         </group>
       </group>
-    </macro>
-    <macro name="dictionary">
-      <group delimiter=", ">
-        <text macro="title" quotes="true"/>
-        <group delimiter=" ">
-          <text term="in"/>
-          <text variable="container-title" font-style="italic"/>
-        </group>
-        <group delimiter=" ">
-          <label variable="volume" form="short"/>
-          <text variable="volume"/>
-        </group>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <macro name="book">
+    <group delimiter=", ">
+      <text macro="title"/>
+      <text macro="edition"/>
+      <text macro="publisher"/>
+      <group delimiter=" ">
         <text macro="year-date"/>
-        <text macro="pages"/>
+        <text macro="collection"/>
       </group>
-    </macro>
-    <macro name="chapter">
+    </group>
+  </macro>
+  <macro name="dictionary">
+    <group delimiter=", ">
+      <text macro="title" quotes="true"/>
       <group delimiter=" ">
-        <text macro="title" quotes="true" suffix=","/>
         <text term="in"/>
-        <text macro="editor" suffix=","/>
-        <text variable="container-title" font-style="italic" suffix=","/>
-        <text macro="publisher" suffix=","/>
-        <group delimiter=" " suffix=",">
-          <text macro="year-date"/>
-          <text macro="collection"/>
-        </group>
-        <text macro="pages"/>
+        <text variable="container-title" font-style="italic"/>
       </group>
-    </macro>
-    <citation disambiguate-add-year-suffix="true" et-al-subsequent-min="3" et-al-subsequent-use-first="1">
-      <layout delimiter=" ; ">
-        <choose>
-          <if position="subsequent">
-            <group delimiter=", ">
-              <text macro="author"/>
-              <text variable="title" form="short" font-style="italic" suffix="…"/>
-              <group delimiter=" ">
-                <text term="cited" font-style="italic"/>
-                <group delimiter=" ">
-                  <text term="note" form="short"/>
-                  <text variable="first-reference-note-number"/>
-                </group>
+      <group delimiter="&#160;">
+        <label variable="volume" form="short"/>
+        <text variable="volume"/>
+      </group>
+      <text macro="year-date"/>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <macro name="chapter">
+    <group delimiter=" ">
+      <text macro="title" quotes="true" suffix=","/>
+      <text term="in"/>
+      <text macro="editor" suffix=","/>
+      <text variable="container-title" font-style="italic" suffix=","/>
+      <text macro="publisher" suffix=","/>
+      <group delimiter=" " suffix=",">
+        <text macro="year-date"/>
+        <text macro="collection"/>
+      </group>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <citation disambiguate-add-year-suffix="true" et-al-subsequent-min="3" et-al-subsequent-use-first="1">
+    <layout delimiter="&#160;; ">
+      <choose>
+        <if position="subsequent">
+          <group delimiter=", ">
+            <text macro="author"/>
+            <text variable="title" form="short" font-style="italic" suffix="…"/>
+            <group delimiter=" ">
+              <text term="cited" font-style="italic"/>
+              <group delimiter="&#160;">
+                <text term="note" form="short"/>
+                <text variable="first-reference-note-number"/>
               </group>
-              <text macro="locator"/>
             </group>
-          </if>
-          <else>
-            <text macro="author" suffix=", "/>
-            <choose>
-              <if type="thesis">
-                <text macro="thesis"/>
-              </if>
-              <else-if type="webpage article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
-                <text macro="articles"/>
-              </else-if>
-              <else-if type="book graphic" match="any">
-                <text macro="book"/>
-              </else-if>
-              <else-if type="entry-dictionary entry-encyclopedia" match="any">
-                <text macro="dictionary"/>
-              </else-if>
-              <else-if type="chapter paper-conference" match="any">
-                <text macro="chapter"/>
-              </else-if>
-            </choose>
-            <text macro="locator-cit" prefix=", "/>
-          </else>
-        </choose>
-      </layout>
-    </citation>
-    <bibliography>
-      <sort>
-        <key macro="author"/>
-        <key variable="issued"/>
-        <key variable="page-first"/>
-        <key variable="title"/>
-      </sort>
-      <layout suffix=".">
-        <group display="block">
-          <choose>
-            <if variable="author" match="any">
-              <group delimiter=" " suffix=" = ">
-                <text macro="author-short"/>
-                <text macro="year-date"/>
-                <text variable="year-suffix"/>
-              </group>
-            </if>
-            <else-if variable="editor" match="any">
-              <group delimiter=" " suffix=" = ">
-                <text macro="editor-short"/>
-                <text macro="year-date"/>
-                <text variable="year-suffix"/>
-              </group>
-            </else-if>
-            <else>
-              <text variable="title-short"/>
-              <text macro="year-date" prefix=" " suffix=" = "/>
-            </else>
-          </choose>
+            <text macro="locator"/>
+          </group>
+        </if>
+        <else>
           <text macro="author" suffix=", "/>
           <choose>
             <if type="thesis">
               <text macro="thesis"/>
-              <group delimiter=" ">
-                <text variable="number-of-pages"/>
-                <text term="page" form="short"/>
-              </group>
             </if>
             <else-if type="webpage article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
               <text macro="articles"/>
@@ -313,7 +257,63 @@
               <text macro="chapter"/>
             </else-if>
           </choose>
-        </group>
-      </layout>
-    </bibliography>
-  </style>
+          <text macro="locator-cit" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+      <key variable="page-first"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group display="block">
+        <choose>
+          <if variable="author" match="any">
+            <group delimiter=" " suffix=" = ">
+              <text macro="author-short"/>
+              <text macro="year-date"/>
+              <text variable="year-suffix"/>
+            </group>
+          </if>
+          <else-if variable="editor" match="any">
+            <group delimiter=" " suffix=" = ">
+              <text macro="editor-short"/>
+              <text macro="year-date"/>
+              <text variable="year-suffix"/>
+            </group>
+          </else-if>
+          <else>
+            <text variable="title-short"/>
+            <text macro="year-date" prefix="&#160;" suffix="&#160;= "/>
+          </else>
+        </choose>
+        <text macro="author" suffix=", "/>
+        <choose>
+          <if type="thesis">
+            <text macro="thesis"/>
+            <group delimiter="&#160;">
+              <text variable="number-of-pages"/>
+              <text term="page" form="short"/>
+            </group>
+          </if>
+          <else-if type="webpage article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
+            <text macro="articles"/>
+          </else-if>
+          <else-if type="book graphic" match="any">
+            <text macro="book"/>
+          </else-if>
+          <else-if type="entry-dictionary entry-encyclopedia" match="any">
+            <text macro="dictionary"/>
+          </else-if>
+          <else-if type="chapter paper-conference" match="any">
+            <text macro="chapter"/>
+          </else-if>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/collection-de-l-ecole-francaise-de-rome-note.csl b/collection-de-l-ecole-francaise-de-rome-note.csl
index 1be994d56c..e34c3821e9 100644
--- a/collection-de-l-ecole-francaise-de-rome-note.csl
+++ b/collection-de-l-ecole-francaise-de-rome-note.csl
@@ -1,272 +1,272 @@
 <?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="fr-FR" page-range-format="expanded" initialize-with-hyphen="true">
-    <info>
-      <title>Collection de l'Ecole française de Rome (note, French)</title>
-      <id>http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-note</id>
-      <link href="http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-note" rel="self"/>
-      <link href="http://www.publications.efrome.it/opencms/export/sites/efrome/documenti/norme_fr.pdf" rel="documentation"/>
-      <link href="http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-full-note" rel="template"/>
-      <author>
-        <name>Nicolas Monteix</name>
-        <email>nicolas.monteix@univ-rouen.fr</email>
-      </author>
-      <category citation-format="note"/>
-      <category field="history"/>
-      <category field="anthropology"/>
-      <issn>0223-5099</issn>
-      <summary>Feuille de style pour la Collection de l'Ecole française de Rome. Les références bibliographiques sont abrégées sous la forme Auteur-date en note</summary>
-      <updated>2015-12-02T04:18:39+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="fr">
-      <terms>
-        <term name="editor" form="short">
-          <single>dir.</single>
-          <multiple>dir.</multiple>
-        </term>
-        <term name="paragraph">§</term>
-        <term name="in">dans</term>
-        <term name="online">mis en ligne le</term>
-        <term name="anonymous">anonyme</term>
-        <term name="anonymous" form="short">anon.</term>
-        <term name="no date">sans date</term>
-        <term name="no date" form="short">s. d.</term>
-        <term name="cited">op. cit.</term>
-      </terms>
-    </locale>
-    <macro name="author">
-      <names variable="author" delimiter=", ">
-        <name sort-separator=", " delimiter=", " initialize-with="."/>
-        <et-al font-style="italic"/>
-        <substitute>
-          <text macro="editor"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="editor">
-      <names variable="editor" delimiter=", ">
-        <name sort-separator=", " delimiter=", " initialize-with="."/>
-        <et-al font-style="italic"/>
-        <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-      </names>
-    </macro>
-    <macro name="author-short">
-      <names variable="author" delimiter=", ">
-        <name form="short" et-al-min="4" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
-        <et-al font-style="italic"/>
-        <substitute>
-          <text macro="editor-short"/>
-          <text variable="title" form="short"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="editor-short">
-      <names variable="editor">
-        <name form="short" et-al-min="4" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
-        <et-al font-style="italic"/>
-        <substitute>
-          <names variable="container-author"/>
-        </substitute>
-      </names>
-    </macro>
-    <macro name="pages">
-      <group delimiter=" ">
-        <label variable="page" form="short"/>
-        <text variable="page"/>
-      </group>
-    </macro>
-    <macro name="access">
-      <group>
-        <text term="accessed" suffix=" "/>
-        <date variable="accessed" form="numeric">
-          <date-part name="day"/>
-          <date-part name="month"/>
+  <info>
+    <title>Collection de l'Ecole française de Rome (note, French)</title>
+    <id>http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-note</id>
+    <link href="http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-note" rel="self"/>
+    <link href="http://www.zotero.org/styles/collection-de-l-ecole-francaise-de-rome-full-note" rel="template"/>
+    <link href="http://www.publications.efrome.it/opencms/export/sites/efrome/documenti/norme_fr.pdf" rel="documentation"/>
+    <author>
+      <name>Nicolas Monteix</name>
+      <email>nicolas.monteix@univ-rouen.fr</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="history"/>
+    <category field="anthropology"/>
+    <issn>0223-5099</issn>
+    <summary>Feuille de style pour la Collection de l'Ecole française de Rome. Les références bibliographiques sont abrégées sous la forme Auteur-date en note</summary>
+    <updated>2015-12-02T04:18:39+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="fr">
+    <terms>
+      <term name="editor" form="short">
+        <single>dir.</single>
+        <multiple>dir.</multiple>
+      </term>
+      <term name="paragraph">§</term>
+      <term name="in">dans</term>
+      <term name="online">mis en ligne le</term>
+      <term name="anonymous">anonyme</term>
+      <term name="anonymous" form="short">anon.</term>
+      <term name="no date">sans date</term>
+      <term name="no date" form="short">s.&#160;d.</term>
+      <term name="cited">op. cit.</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author" delimiter=", ">
+      <name sort-separator=", " delimiter=", " initialize-with="."/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <text macro="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name sort-separator=", " delimiter=", " initialize-with="."/>
+      <et-al font-style="italic"/>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author" delimiter=", ">
+      <name form="short" et-al-min="4" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <text macro="editor-short"/>
+        <text variable="title" form="short"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor-short">
+    <names variable="editor">
+      <name form="short" et-al-min="4" et-al-use-first="1" delimiter=" - " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="container-author"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="pages">
+    <group delimiter="&#160;">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group>
+      <text term="accessed" suffix="&#160;"/>
+      <date variable="accessed" form="numeric">
+        <date-part name="day"/>
+        <date-part name="month"/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="collection">
+    <group delimiter=", " prefix="(" suffix=")">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else-if type="webpage" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="container-title" match="none">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place"/>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
           <date-part name="year"/>
         </date>
-      </group>
-    </macro>
-    <macro name="collection">
-      <group delimiter=", " prefix="(" suffix=")">
-        <text variable="collection-title"/>
-        <text variable="collection-number"/>
-      </group>
-    </macro>
-    <macro name="title">
-      <choose>
-        <if type="book" match="any">
-          <text variable="title" font-style="italic"/>
-        </if>
-        <else-if type="webpage" match="any">
-          <text variable="title"/>
-        </else-if>
-        <else-if variable="container-title" match="none">
-          <text variable="title" font-style="italic"/>
-        </else-if>
-        <else>
-          <text variable="title"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="publisher">
-      <text variable="publisher-place"/>
-    </macro>
-    <macro name="year-date">
-      <choose>
-        <if variable="issued">
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
-        </if>
-        <else>
-          <text term="no date" form="short"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="edition">
-      <choose>
-        <if is-numeric="edition">
-          <group delimiter=" ">
-            <number variable="edition" form="ordinal"/>
-            <text term="edition" form="short" text-case="lowercase"/>
-          </group>
-        </if>
-        <else>
-          <text variable="edition"/>
-        </else>
-      </choose>
-    </macro>
-    <macro name="thesis">
-      <group prefix=" " delimiter=", ">
-        <text macro="title" font-style="italic"/>
-        <text variable="genre"/>
-        <text variable="publisher"/>
-        <text macro="year-date"/>
-      </group>
-    </macro>
-    <macro name="articles">
-      <group delimiter=", ">
-        <text macro="title" quotes="true"/>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
         <group delimiter=" ">
-          <text term="in"/>
-          <text variable="container-title" font-style="italic"/>
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" text-case="lowercase"/>
         </group>
-        <text variable="volume"/>
-        <text variable="issue"/>
-        <group delimiter=" ">
-          <text macro="year-date"/>
-          <group prefix="(" suffix=")" delimiter=", ">
-            <text variable="URL"/>
-            <text macro="access"/>
-          </group>
-        </group>
-        <text macro="pages"/>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="thesis">
+    <group prefix=" " delimiter=", ">
+      <text macro="title" font-style="italic"/>
+      <text variable="genre"/>
+      <text variable="publisher"/>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="articles">
+    <group delimiter=", ">
+      <text macro="title" quotes="true"/>
+      <group delimiter=" ">
+        <text term="in"/>
+        <text variable="container-title" font-style="italic"/>
       </group>
-    </macro>
-    <macro name="book">
-      <group delimiter=", ">
-        <text macro="title"/>
-        <text macro="edition"/>
-        <text macro="publisher"/>
-        <group delimiter=" ">
-          <text macro="year-date"/>
-          <text macro="collection"/>
+      <text variable="volume"/>
+      <text variable="issue"/>
+      <group delimiter=" ">
+        <text macro="year-date"/>
+        <group prefix="(" suffix=")" delimiter=", ">
+          <text variable="URL"/>
+          <text macro="access"/>
         </group>
       </group>
-    </macro>
-    <macro name="dictionary">
-      <group delimiter=", ">
-        <text macro="title" quotes="true"/>
-        <group delimiter=" ">
-          <text term="in"/>
-          <text variable="container-title" font-style="italic"/>
-        </group>
-        <group delimiter=" ">
-          <label variable="volume" form="short"/>
-          <text variable="volume"/>
-        </group>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <macro name="book">
+    <group delimiter=", ">
+      <text macro="title"/>
+      <text macro="edition"/>
+      <text macro="publisher"/>
+      <group delimiter=" ">
         <text macro="year-date"/>
-        <text macro="pages"/>
+        <text macro="collection"/>
       </group>
-    </macro>
-    <macro name="chapter">
+    </group>
+  </macro>
+  <macro name="dictionary">
+    <group delimiter=", ">
+      <text macro="title" quotes="true"/>
       <group delimiter=" ">
-        <text macro="title" quotes="true" suffix=","/>
         <text term="in"/>
-        <text macro="editor" suffix=","/>
-        <text variable="container-title" font-style="italic" suffix=","/>
-        <text macro="publisher" suffix=","/>
-        <group delimiter=" " suffix=",">
-          <text macro="year-date"/>
-          <text macro="collection"/>
-        </group>
-        <text macro="pages"/>
+        <text variable="container-title" font-style="italic"/>
+      </group>
+      <group delimiter="&#160;">
+        <label variable="volume" form="short"/>
+        <text variable="volume"/>
       </group>
-    </macro>
-    <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true">
-      <sort>
-        <key variable="issued"/>
-        <key macro="author"/>
-        <key variable="page-first"/>
-      </sort>
-      <layout delimiter=" ; ">
-        <text macro="author-short" suffix=" "/>
+      <text macro="year-date"/>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <macro name="chapter">
+    <group delimiter=" ">
+      <text macro="title" quotes="true" suffix=","/>
+      <text term="in"/>
+      <text macro="editor" suffix=","/>
+      <text variable="container-title" font-style="italic" suffix=","/>
+      <text macro="publisher" suffix=","/>
+      <group delimiter=" " suffix=",">
         <text macro="year-date"/>
-        <group prefix=", ">
-          <label variable="locator" form="symbol" suffix=" "/>
-          <text variable="locator"/>
-        </group>
-      </layout>
-    </citation>
-    <bibliography>
-      <sort>
-        <key macro="author"/>
-        <key variable="issued"/>
-        <key variable="page-first"/>
-        <key variable="title"/>
-      </sort>
-      <layout suffix=".">
-        <group display="block">
-          <choose>
-            <if variable="author" match="any">
-              <group delimiter=" " suffix=" = ">
-                <text macro="author-short"/>
-                <text macro="year-date"/>
-              </group>
-            </if>
-            <else-if variable="editor" match="any">
-              <group delimiter=" " suffix=" = ">
-                <text macro="editor-short"/>
-                <text macro="year-date"/>
-              </group>
-            </else-if>
-            <else>
-              <text variable="title-short"/>
-              <text macro="year-date" prefix=" " suffix=" = "/>
-            </else>
-          </choose>
-          <text macro="author" suffix=", "/>
-          <choose>
-            <if type="thesis">
-              <text macro="thesis"/>
-              <group delimiter=" ">
-                <text variable="number-of-pages"/>
-                <text term="page" form="short"/>
-              </group>
-            </if>
-            <else-if type="webpage article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
-              <text macro="articles"/>
-            </else-if>
-            <else-if type="book graphic" match="any">
-              <text macro="book"/>
-            </else-if>
-            <else-if type="entry-dictionary entry-encyclopedia" match="any">
-              <text macro="dictionary"/>
-            </else-if>
-            <else-if type="chapter paper-conference" match="any">
-              <text macro="chapter"/>
-            </else-if>
-          </choose>
-        </group>
-      </layout>
-    </bibliography>
-  </style>
+        <text macro="collection"/>
+      </group>
+      <text macro="pages"/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true">
+    <sort>
+      <key variable="issued"/>
+      <key macro="author"/>
+      <key variable="page-first"/>
+    </sort>
+    <layout delimiter="&#160;; ">
+      <text macro="author-short" suffix="&#160;"/>
+      <text macro="year-date"/>
+      <group prefix=",&#160;">
+        <label variable="locator" form="symbol" suffix="&#160;"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+      <key variable="page-first"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group display="block">
+        <choose>
+          <if variable="author" match="any">
+            <group delimiter=" " suffix=" = ">
+              <text macro="author-short"/>
+              <text macro="year-date"/>
+            </group>
+          </if>
+          <else-if variable="editor" match="any">
+            <group delimiter=" " suffix=" = ">
+              <text macro="editor-short"/>
+              <text macro="year-date"/>
+            </group>
+          </else-if>
+          <else>
+            <text variable="title-short"/>
+            <text macro="year-date" prefix="&#160;" suffix="&#160;= "/>
+          </else>
+        </choose>
+        <text macro="author" suffix=", "/>
+        <choose>
+          <if type="thesis">
+            <text macro="thesis"/>
+            <group delimiter="&#160;">
+              <text variable="number-of-pages"/>
+              <text term="page" form="short"/>
+            </group>
+          </if>
+          <else-if type="webpage article-journal article-magazine article-newspaper broadcast personal_communication" match="any">
+            <text macro="articles"/>
+          </else-if>
+          <else-if type="book graphic" match="any">
+            <text macro="book"/>
+          </else-if>
+          <else-if type="entry-dictionary entry-encyclopedia" match="any">
+            <text macro="dictionary"/>
+          </else-if>
+          <else-if type="chapter paper-conference" match="any">
+            <text macro="chapter"/>
+          </else-if>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/collections-electroniques-de-l-inha-full-note.csl b/collections-electroniques-de-l-inha-full-note.csl
index 22ab50a3b4..2518625740 100644
--- a/collections-electroniques-de-l-inha-full-note.csl
+++ b/collections-electroniques-de-l-inha-full-note.csl
@@ -183,13 +183,13 @@
           <group delimiter=", ">
             <text macro="author-short"/>
             <text variable="title" form="short" font-style="italic" suffix="..."/>
-              <group delimiter=" ">
-                <text term="cited" font-style="italic"/>
-                <group delimiter="&#160;">
-                  <text term="note" prefix="à la "/>
-                  <text variable="first-reference-note-number"/>
-                </group>
+            <group delimiter=" ">
+              <text term="cited" font-style="italic"/>
+              <group delimiter="&#160;">
+                <text term="note" prefix="à la "/>
+                <text variable="first-reference-note-number"/>
               </group>
+            </group>
             <text macro="locator"/>
           </group>
         </else-if>
diff --git a/creativity-and-innovation-management.csl b/creativity-and-innovation-management.csl
index e0c44352dc..ac17c92448 100644
--- a/creativity-and-innovation-management.csl
+++ b/creativity-and-innovation-management.csl
@@ -9,10 +9,10 @@
     <author>
       <name>Sebastian Karcher</name>
     </author>
-    <issn>0963-1690</issn>
-    <eissn>1467-8691</eissn>
     <category citation-format="author-date"/>
     <category field="social_science"/>
+    <issn>0963-1690</issn>
+    <eissn>1467-8691</eissn>
     <updated>2012-09-27T22:06:38+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>
@@ -145,10 +145,10 @@
     <group delimiter=" ">
       <choose>
         <if is-numeric="edition">
-	  <group delimiter=" ">
+          <group delimiter=" ">
             <number variable="edition" form="ordinal"/>
-	    <text term="edition" form="short"/>
-	  </group>
+            <text term="edition" form="short"/>
+          </group>
         </if>
         <else>
           <text variable="edition" suffix="."/>
diff --git a/cultural-studies-of-science-education.csl b/cultural-studies-of-science-education.csl
index 7036963fd5..4bc3480ae7 100644
--- a/cultural-studies-of-science-education.csl
+++ b/cultural-studies-of-science-education.csl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-US" xmlns="http://purl.org/net/xbiblio/csl">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-US">
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Cultural Studies of Science Education</title>
     <title-short>CSSE</title-short>
     <id>http://www.zotero.org/styles/cultural-studies-of-science-education</id>
-    <link rel="self" href="http://www.zotero.org/styles/cultural-studies-of-science-education"/>
-    <link rel="template" href="https://www.zotero.org/styles/apa-no-ampersand"/>
-        <link href="http://www.springer.com/education+%26+language/science+education/journal/11422" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/cultural-studies-of-science-education" rel="self"/>
+    <link href="https://www.zotero.org/styles/apa-no-ampersand" rel="template"/>
+    <link href="http://www.springer.com/education+%26+language/science+education/journal/11422" rel="documentation"/>
     <link href="http://owl.english.purdue.edu/owl/resource/560/01/" rel="documentation"/>
     <author>
       <name>Anders Johansson</name>
@@ -444,7 +444,7 @@
             <else>
               <group>
                 <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1–"/>
+                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
               </group>
             </else>
           </choose>
diff --git a/dependent/abi-technik.csl b/dependent/abi-technik.csl
index d5fbb06403..cec40bfe09 100644
--- a/dependent/abi-technik.csl
+++ b/dependent/abi-technik.csl
@@ -8,9 +8,9 @@
     <link href="http://www.degruyter.com/view/supplement/s21914664_Autorenhinweise.pdf" rel="documentation"/>
     <category citation-format="note"/>
     <category field="social_science"/>
-    <summary>Der Chicago Style greift ab Heft 4, 2015.</summary>
     <issn>0720-6763</issn>
     <eissn>2191-4664</eissn>
+    <summary>Der Chicago Style greift ab Heft 4, 2015.</summary>
     <updated>2015-11-22T16:55: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>
diff --git a/dependent/bulletin-of-the-chemical-society-of-japan.csl b/dependent/bulletin-of-the-chemical-society-of-japan.csl
index 19bccb2099..7f34c4897c 100644
--- a/dependent/bulletin-of-the-chemical-society-of-japan.csl
+++ b/dependent/bulletin-of-the-chemical-society-of-japan.csl
@@ -13,8 +13,8 @@
       <uri>http://www.mendeley.com/profiles/shoji-takahashi3/</uri>
     </author>
     <category citation-format="numeric"/>
-	<category field="chemistry"/>
-	<issn>0009-2673</issn>
+    <category field="chemistry"/>
+    <issn>0009-2673</issn>
     <eissn>1348-0634</eissn>
     <updated>2015-12-04T01:42:50+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>
diff --git a/early-christianity.csl b/early-christianity.csl
index e56ef7841b..446507b36c 100644
--- a/early-christianity.csl
+++ b/early-christianity.csl
@@ -754,7 +754,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="10" et-al-use-first="9" subsequent-author-substitute="———" entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="10" et-al-use-first="9" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
     <sort>
       <key macro="contributors-sort"/>
       <key variable="title"/>
@@ -778,4 +778,3 @@
     </layout>
   </bibliography>
 </style>
-
diff --git a/earthquake-engineering-and-structural-dynamics.csl b/earthquake-engineering-and-structural-dynamics.csl
index 75e028ae37..18d8bb6c1c 100644
--- a/earthquake-engineering-and-structural-dynamics.csl
+++ b/earthquake-engineering-and-structural-dynamics.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" page-range-format="expanded" initialize-with-hyphen="false" demote-non-dropping-particle="sort-only" default-locale="en-US">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Earthquake Engineering &amp; Structural Dynamics</title>
     <title-short>Earthquake Engng. Struct. Dyn.</title-short>
diff --git a/ecclesial-practices.csl b/ecclesial-practices.csl
index 07771d4f2e..6998d5ea60 100644
--- a/ecclesial-practices.csl
+++ b/ecclesial-practices.csl
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="note" version="1.0" page-range-format="chicago" demote-non-dropping-particle="never" default-locale="en-GB" xmlns="http://purl.org/net/xbiblio/csl">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" page-range-format="chicago" demote-non-dropping-particle="never" default-locale="en-GB">
   <info>
     <title>Ecclesial Practices</title>
     <id>http://www.zotero.org/styles/ecclesial-practices</id>
-    <link rel="self" href="http://www.zotero.org/styles/ecclesial-practices"/>
+    <link href="http://www.zotero.org/styles/ecclesial-practices" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
     <link href="http://www.brill.com/sites/default/files/ftp/authors_instructions/EP.pdf" rel="documentation"/>
     <author>
@@ -1157,7 +1157,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
     <sort>
       <key macro="contributors-sort"/>
       <key variable="title"/>
diff --git a/ens-de-lyon-centre-d-ingenierie-documentaire.csl b/ens-de-lyon-centre-d-ingenierie-documentaire.csl
index d49d0b81bf..202716bcf0 100644
--- a/ens-de-lyon-centre-d-ingenierie-documentaire.csl
+++ b/ens-de-lyon-centre-d-ingenierie-documentaire.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="note" default-locale="fr-FR" version="1.0" page-range-format="expanded" demote-non-dropping-particle="sort-only">
   <info>
     <title>ENS de Lyon - Centre d'ingénierie documentaire (French)</title>
diff --git a/environmental-microbiology.csl b/environmental-microbiology.csl
index 0ca773bec6..cf3de044bc 100644
--- a/environmental-microbiology.csl
+++ b/environmental-microbiology.csl
@@ -42,7 +42,7 @@
   <macro name="author-short">
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with=". "/>
-      <et-al font-style="italic"/> 
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
diff --git a/escuela-nacional-de-antropologia-e-historia-author-date.csl b/escuela-nacional-de-antropologia-e-historia-author-date.csl
index 5262d23d68..4b0f53e246 100644
--- a/escuela-nacional-de-antropologia-e-historia-author-date.csl
+++ b/escuela-nacional-de-antropologia-e-historia-author-date.csl
@@ -28,7 +28,7 @@
   <macro name="secondary-contributors">
     <choose>
       <if type="book chapter article" match="any">
-        <choose >
+        <choose>
           <if variable="editor translator" match="any">
             <names variable="editor" delimiter=". ">
               <name and="text" delimiter=", " delimiter-precedes-last="never" prefix=", "/>
@@ -98,7 +98,7 @@
   <!-- Autor para referencia en el texto -->
   <macro name="contributors-short">
     <names variable="author">
-      <name  and="text" delimiter=", " initialize-with=". "/>
+      <name and="text" delimiter=", " initialize-with=". "/>
       <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
diff --git a/ethnologie-francaise.csl b/ethnologie-francaise.csl
index 323bd98d08..d6f67dfa87 100644
--- a/ethnologie-francaise.csl
+++ b/ethnologie-francaise.csl
@@ -12,42 +12,42 @@
     <category citation-format="author-date"/>
     <category field="history"/>
     <category field="anthropology"/>
-	<issn>0046-2616</issn>
+    <issn>0046-2616</issn>
     <eissn>2101-0064</eissn>
     <summary>Author-date style for Ethnologie française - revue des PUR</summary>
     <updated>2015-11-14T04:18:55+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
- <locale xml:lang="fr">
-    <terms>      
+  <locale xml:lang="fr">
+    <terms>
       <term name="in">in</term>
       <term name="anonymous">anonyme</term>
       <term name="anonymous" form="short">anon.</term>
       <term name="accessed">consulté&#160;le</term>
       <term name="no date">sans date</term>
-	  <term name="translator" form="short">trad.</term>
-	  <term name="editor" form="short">
-		<single>dir.</single>
+      <term name="translator" form="short">trad.</term>
+      <term name="editor" form="short">
+        <single>dir.</single>
         <multiple>dir.</multiple>
-		</term>
-      <term name="no date" form="short">[s.&#160;d.]</term>	  
+      </term>
+      <term name="no date" form="short">[s.&#160;d.]</term>
     </terms>
   </locale>
   <macro name="author">
     <names variable="author" delimiter=", ">
-      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", ">		
-		<name-part name="family" font-variant="small-caps" />
-		<name-part name="given" />
-		</name>
+      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", ">
+        <name-part name="family" font-variant="small-caps"/>
+        <name-part name="given"/>
+      </name>
       <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
-	</substitute>
+      </substitute>
     </names>
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name and="text" sort-separator=" " delimiter=", " >		
+      <name and="text" sort-separator=" " delimiter=", ">		
 		</name>
       <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
     </names>
@@ -81,7 +81,7 @@
         <date-part name="year"/>
       </date>
     </group>
-  </macro>  
+  </macro>
   <macro name="title">
     <choose>
       <if type="book" match="any">
@@ -149,22 +149,22 @@
     <layout prefix=" [" suffix="]" delimiter="&#160;; ">
       <text macro="author-short" suffix=", "/>
       <text macro="year-date"/>
-	  <group >	  
-	  	  <text macro="loc-cite" prefix="&#160;:&#160;"/>	  
+      <group>
+        <text macro="loc-cite" prefix="&#160;:&#160;"/>
       </group>
     </layout>
   </citation>
   <bibliography subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="1">
-	<sort>
+    <sort>
       <key macro="author"/>
       <key variable="issued"/>
       <key variable="page-first"/>
       <key variable="title"/>
     </sort>
     <layout suffix=".">
-      <group >
+      <group>
         <text macro="author" suffix=", "/>
-		<text macro="year-date" suffix=", "/>
+        <text macro="year-date" suffix=", "/>
         <choose>
           <if type="thesis">
             <group delimiter=", " suffix=".">
@@ -173,8 +173,8 @@
               <text variable="publisher"/>
               <text variable="publisher-place"/>
               <group>
-                <text variable="number-of-volumes" suffix="&#160;vol." />
-				<text variable="number-of-pages" suffix="&#160;p."/>
+                <text variable="number-of-volumes" suffix="&#160;vol."/>
+                <text variable="number-of-pages" suffix="&#160;p."/>
               </group>
             </group>
           </if>
@@ -198,7 +198,7 @@
             <group suffix=".">
               <text macro="title" suffix=", "/>
               <text macro="edition"/>
-              <text macro="publisher"/>              
+              <text macro="publisher"/>
             </group>
           </else-if>
           <else-if type="chapter paper-conference" match="any">
@@ -207,7 +207,7 @@
               <text value="in" font-style="italic" suffix=" "/>
               <text macro="editor" suffix=", "/>
               <text variable="container-title" font-style="italic"/>
-              <text macro="publisher" prefix=", "/>              
+              <text macro="publisher" prefix=", "/>
               <text macro="pages" suffix="."/>
             </group>
           </else-if>
@@ -216,4 +216,3 @@
     </layout>
   </bibliography>
 </style>
-	  
diff --git a/ets-ecole-de-technologie-superieure.csl b/ets-ecole-de-technologie-superieure.csl
index 4b953c8551..02d9b4c878 100644
--- a/ets-ecole-de-technologie-superieure.csl
+++ b/ets-ecole-de-technologie-superieure.csl
@@ -125,23 +125,23 @@
     <choose>
       <if variable="DOI" match="any">
         <group delimiter=". ">
-	  <text variable="DOI" prefix="&lt;http://doi.org/" suffix="&gt;"/>
-	  <date variable="accessed" delimiter=" " prefix="Consulté le ">
-	    <date-part name="day"/>
-	    <date-part name="month"/>
+          <text variable="DOI" prefix="&lt;http://doi.org/" suffix="&gt;"/>
+          <date variable="accessed" delimiter=" " prefix="Consulté le ">
+            <date-part name="day"/>
+            <date-part name="month"/>
             <date-part name="year"/>
-	  </date>
-	</group>
+          </date>
+        </group>
       </if>
       <else-if variable="URL" match="any">
-	<group delimiter=". ">
-	  <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-	  <date variable="accessed" delimiter=" " prefix="Consulté le ">
-	    <date-part name="day"/>
-	    <date-part name="month"/>
-	    <date-part name="year"/>
-	  </date>
-	</group>
+        <group delimiter=". ">
+          <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+          <date variable="accessed" delimiter=" " prefix="Consulté le ">
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
+          </date>
+        </group>
       </else-if>
     </choose>
   </macro>
diff --git a/food-and-agriculture-organization-of-the-united-nations.csl b/food-and-agriculture-organization-of-the-united-nations.csl
index 633102ec4c..23a9d885bb 100644
--- a/food-and-agriculture-organization-of-the-united-nations.csl
+++ b/food-and-agriculture-organization-of-the-united-nations.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" demote-non-dropping-particle="sort-only" default-locale="en-GB">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Food and Agriculture Organization of the United Nations</title>
     <title-short>FAO</title-short>
     <id>http://www.zotero.org/styles/food-and-agriculture-organization-of-the-united-nations</id>
-    <link rel="self" href="http://www.zotero.org/styles/food-and-agriculture-organization-of-the-united-nations"/>
+    <link href="http://www.zotero.org/styles/food-and-agriculture-organization-of-the-united-nations" rel="self"/>
     <link href="http://www.fao.org/docrep/004/ac339e/AC339E01.htm#P207_14907" rel="documentation"/>
     <author>
       <name>Bin Liu</name>
diff --git a/harvard-cite-them-right.csl b/harvard-cite-them-right.csl
index d3a6c33487..486f19d48c 100644
--- a/harvard-cite-them-right.csl
+++ b/harvard-cite-them-right.csl
@@ -31,14 +31,14 @@
         <names variable="container-author" delimiter=", " suffix=", ">
           <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
         </names>
-	<choose>
-	  <if variable="container-author" match="none">
+        <choose>
+          <if variable="container-author" match="none">
             <names variable="editor translator" delimiter=", ">
               <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
               <label form="short" prefix=" (" suffix=")"/>
             </names>
-	  </if>
-	</choose>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
@@ -117,10 +117,10 @@
   <macro name="number-volumes">
     <choose>
       <if variable="volume" match="none">
-	<group delimiter=" " prefix="(" suffix=")">
-	  <text variable="number-of-volumes"/>
-	  <label variable="volume" form="short" strip-periods="true"/>
-	</group>
+        <group delimiter=" " prefix="(" suffix=")">
+          <text variable="number-of-volumes"/>
+          <label variable="volume" form="short" strip-periods="true"/>
+        </group>
       </if>
     </choose>
   </macro>
@@ -128,10 +128,10 @@
     <choose>
       <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any">
         <group delimiter=". ">
-	  <group delimiter=" ">
+          <group delimiter=" ">
             <text variable="title" font-style="italic"/>
-	    <text macro="number-volumes"/>
-	  </group>
+            <text macro="number-volumes"/>
+          </group>
           <text macro="edition"/>
         </group>
       </if>
diff --git a/harvard-stellenbosch-university.csl b/harvard-stellenbosch-university.csl
index 5be1bd468f..e8d7e7c802 100644
--- a/harvard-stellenbosch-university.csl
+++ b/harvard-stellenbosch-university.csl
@@ -7,9 +7,9 @@
     <link href="http://www.zotero.org/styles/harvard-university-of-gloucestershire" rel="template"/>
     <link href="http://libguides.sun.ac.za/content.php?pid=344501&amp;sid=2818229" rel="documentation"/>
     <author>
-    <name>Yusuf Ras</name>
-    <email>yr@sun.ac.za</email>
-    <uri>http://www.mendeley.com/profiles/yusuf-ras/</uri>
+      <name>Yusuf Ras</name>
+      <email>yr@sun.ac.za</email>
+      <uri>http://www.mendeley.com/profiles/yusuf-ras/</uri>
     </author>
     <category citation-format="author-date"/>
     <category field="generic-base"/>
@@ -133,7 +133,7 @@
       <if variable="DOI"/>
       <else-if variable="URL">
         <group delimiter=" ">
-        <group delimiter=": ">
+          <group delimiter=": ">
             <group delimiter=", ">
               <text term="online" prefix="[" suffix="]" text-case="capitalize-first"/>
               <text term="available at" text-case="capitalize-first"/>
diff --git a/harvard-university-of-worcester.csl b/harvard-university-of-worcester.csl
index a32b01ecc1..cb33271a14 100644
--- a/harvard-university-of-worcester.csl
+++ b/harvard-university-of-worcester.csl
@@ -3,8 +3,8 @@
   <info>
     <title>Harvard - University of Worcester</title>
     <id>http://www.zotero.org/styles/harvard-university-of-worcester</id>
-    <link rel="self" href="http://www.zotero.org/styles/harvard-university-of-worcester"/>
-    <link rel="documentation" href="http://www.worc.ac.uk/ils/documents/Harvard_referencing"/>
+    <link href="http://www.zotero.org/styles/harvard-university-of-worcester" rel="self"/>
+    <link href="http://www.worc.ac.uk/ils/documents/Harvard_referencing" rel="documentation"/>
     <author>
       <name>Christopher Hill</name>
       <uri>http://www.mendeley.com/profiles/christopher-hill7/</uri>
diff --git a/harvard-york-st-john-university.csl b/harvard-york-st-john-university.csl
index 90791a4b85..46b5c62209 100644
--- a/harvard-york-st-john-university.csl
+++ b/harvard-york-st-john-university.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="sort-only" default-locale="en-GB">
   <info>
     <title>Harvard - York St John University</title>
     <title-short>Harvard-YSJU</title-short>
     <id>http://www.zotero.org/styles/harvard-york-st-john-university</id>
     <link href="http://www.zotero.org/styles/harvard-york-st-john-university" rel="self"/>
-    <link href="http://issuu.com/ysjils/docs/a5_harvard_referencing_2015-16_v2" rel="documentation"/>
     <link href="http://www.zotero.org/styles/harvard-anglia-ruskin-university" rel="template"/>
+    <link href="http://issuu.com/ysjils/docs/a5_harvard_referencing_2015-16_v2" rel="documentation"/>
     <author>
       <name>Steven Singleton</name>
       <email>stvn@gmx.ie</email>
diff --git a/harvard7de.csl b/harvard7de.csl
index 8e7f7b2156..b24c91022a 100644
--- a/harvard7de.csl
+++ b/harvard7de.csl
@@ -153,11 +153,11 @@
     <choose>
       <if type="article-journal article-magazine" match="any">
         <group delimiter=" ">
-         <text variable="volume"/>
-         <!-- <date variable="issued">
+          <text variable="volume"/>
+          <!-- <date variable="issued">
           <date-part name="year" prefix="(" suffix=")"/>
           </date>-->
-         <text variable="issue" prefix="(" suffix=")"/>
+          <text variable="issue" prefix="(" suffix=")"/>
         </group>
       </if>
     </choose>
diff --git a/infoclio-de.csl b/infoclio-de.csl
index 7ad95cfae4..bd3c44eb5b 100644
--- a/infoclio-de.csl
+++ b/infoclio-de.csl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="de-CH" version="1.0"
-       name-delimiter="; " delimiter-precedes-last="always" delimiter-precedes-et-al="never">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="de-CH" version="1.0" name-delimiter="; " delimiter-precedes-last="always" delimiter-precedes-et-al="never">
   <info>
     <title>Infoclio (German - Switzerland)</title>
     <id>http://www.zotero.org/styles/infoclio-de</id>
@@ -39,7 +38,6 @@
       <term name="no date" form="short">o. D.</term>
     </terms>
   </locale>
-
   <citation>
     <layout suffix="." delimiter="&#160;; ">
       <choose>
@@ -61,7 +59,6 @@
       </choose>
     </layout>
   </citation>
-
   <bibliography>
     <sort>
       <key macro="creator" names-min="3" names-use-first="3"/>
@@ -71,7 +68,6 @@
       <text macro="complete-reference"/>
     </layout>
   </bibliography>
-
   <macro name="complete-reference">
     <group delimiter=". ">
       <group delimiter=", ">
@@ -108,7 +104,6 @@
       <text macro="url-non-web-documents"/>
     </group>
   </macro>
-
   <macro name="subsequent-reference">
     <group delimiter=", ">
       <group delimiter=": ">
@@ -119,12 +114,9 @@
       <text macro="locator"/>
     </group>
   </macro>
-
   <macro name="creator">
     <names variable="author">
-      <name sort-separator=", "
-            name-as-sort-order="all"
-            et-al-min="4" et-al-use-first="3"/>
+      <name sort-separator=", " name-as-sort-order="all" et-al-min="4" et-al-use-first="3"/>
       <label form="short" prefix="&#160;(" suffix=")"/>
       <substitute>
         <names variable="editor"/>
@@ -133,11 +125,9 @@
       </substitute>
     </names>
   </macro>
-
   <macro name="creator-for-subsequent">
     <names variable="author">
-      <name form="short"
-            et-al-min="4" et-al-use-first="1"/>
+      <name form="short" et-al-min="4" et-al-use-first="1"/>
       <label form="short" prefix="&#160;(" suffix=")"/>
       <substitute>
         <names variable="editor"/>
@@ -146,11 +136,9 @@
       </substitute>
     </names>
   </macro>
-
   <macro name="title">
     <text variable="title"/>
   </macro>
-
   <macro name="identifier-for-subsequent">
     <choose>
       <if variable="title title-short" match="any">
@@ -171,33 +159,25 @@
           <name et-al-min="2" et-al-use-first="1"/>
         </names>
       </else-if>
-      <else-if type="report song broadcast motion_picture
-                     webpage post post-weblog" match="any">
+      <else-if type="report song broadcast motion_picture                      webpage post post-weblog" match="any">
         <!-- these types have either collection-title or container-title -->
         <text variable="collection-title"/>
         <text variable="container-title"/>
       </else-if>
     </choose>
   </macro>
-
   <macro name="in">
     <choose>
-      <if type="chapter paper-conference
-                entry-encyclopedia entry-dictionary
-                article-magazine article-newspaper article-journal"
-          match="any">
+      <if type="chapter paper-conference                 entry-encyclopedia entry-dictionary                 article-magazine article-newspaper article-journal" match="any">
         <text term="in"/>
       </if>
     </choose>
   </macro>
-
   <macro name="container-creator">
     <choose>
       <if type="chapter paper-conference" match="any">
         <names variable="editor">
-          <name sort-separator=", "
-                name-as-sort-order="all"
-                et-al-min="4" et-al-use-first="3"/>
+          <name sort-separator=", " name-as-sort-order="all" et-al-min="4" et-al-use-first="3"/>
           <label form="short" prefix="&#160;(" suffix=")"/>
           <substitute>
             <names variable="container-author"/>
@@ -207,16 +187,12 @@
       </if>
     </choose>
   </macro>
-
   <macro name="container-information">
     <choose>
-      <if type="chapter paper-conference
-                entry-encyclopedia entry-dictionary
-                article-newspaper article-magazine article-journal" match="any">
+      <if type="chapter paper-conference                 entry-encyclopedia entry-dictionary                 article-newspaper article-magazine article-journal" match="any">
         <text variable="container-title"/>
       </if>
-      <else-if type="report song broadcast motion_picture
-                     webpage post post-weblog" match="any">
+      <else-if type="report song broadcast motion_picture                      webpage post post-weblog" match="any">
         <group delimiter=", ">
           <text variable="genre"/>
           <!-- these types have either collection-title or container-title -->
@@ -226,7 +202,6 @@
       </else-if>
     </choose>
   </macro>
-  
   <macro name="journal-volume">
     <choose>
       <if type="article-journal">
@@ -240,12 +215,9 @@
       </else-if>
     </choose>
   </macro>
-  
   <macro name="volumes">
     <choose>
-      <if type="book chapter
-                entry-encyclopedia entry-dictionary
-                song motion_picture" match="any">
+      <if type="book chapter                 entry-encyclopedia entry-dictionary                 song motion_picture" match="any">
         <group delimiter=" / ">
           <group delimiter="&#160;">
             <label variable="volume" form="short"/>
@@ -263,7 +235,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="type-description">
     <choose>
       <if type="manuscript thesis speech" match="any">
@@ -310,12 +281,9 @@
       </else-if>
     </choose>
   </macro>
-
   <macro name="alt-publisher">
     <choose>
-      <if type="book chapter
-                paper-conference
-                entry-dictionary entry-encyclopedia" match="none">
+      <if type="book chapter                 paper-conference                 entry-dictionary entry-encyclopedia" match="none">
         <!-- university for theses,
              institution for reports,
              label for songs,
@@ -326,7 +294,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="place">
     <choose>
       <if type="speech">
@@ -340,7 +307,6 @@
       </else>
     </choose>
   </macro>
-          
   <macro name="date">
     <choose>
       <if type="book chapter paper-conference thesis" match="any">
@@ -358,10 +324,7 @@
           </else>
         </choose>
       </if>
-      <else-if type="article-journal article-newspaper article-magazine
-                     graphic entry-encyclopedia entry-dictionary
-                     report speech interview
-                     manuscript personal_communication" match="any">
+      <else-if type="article-journal article-newspaper article-magazine                      graphic entry-encyclopedia entry-dictionary                      report speech interview                      manuscript personal_communication" match="any">
         <choose>
           <if variable="issued">
             <date variable="issued" form="numeric" date-parts="year-month-day"/>
@@ -376,7 +339,6 @@
       </else>
     </choose>
   </macro>
-
   <macro name="pages">
     <choose>
       <if variable="locator">
@@ -390,18 +352,15 @@
       </else>
     </choose>
   </macro>
-
   <macro name="locator">
     <group delimiter="&#160;">
       <label variable="locator" form="short"/>
       <text variable="locator"/>
     </group>
   </macro>
-
   <macro name="book-series">
     <choose>
-      <if type="book chapter paper-conference
-                entry-dictionary entry-encyclopedia" match="any">
+      <if type="book chapter paper-conference                 entry-dictionary entry-encyclopedia" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <text variable="collection-title"/>
           <choose>
@@ -413,7 +372,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="artwork-description">
     <choose>
       <if type="graphic">
@@ -425,7 +383,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="archive-location">
     <choose>
       <if variable="archive">
@@ -437,15 +394,13 @@
       </if>
     </choose>
   </macro>
-
   <macro name="url-web-documents-only">
     <choose>
       <if type="webpage post post-weblog">
-          <text macro="url"/>
+        <text macro="url"/>
       </if>
     </choose>
   </macro>
-
   <macro name="url-non-web-documents">
     <choose>
       <if variable="DOI">
@@ -473,7 +428,6 @@
       </else-if>
     </choose>
   </macro>
-
   <macro name="url">
     <group delimiter=", ">
       <text variable="URL" prefix="&lt;" suffix="&gt;"/>
@@ -483,5 +437,4 @@
       </group>
     </group>
   </macro>
-
 </style>
diff --git a/infoclio-fr-nocaps.csl b/infoclio-fr-nocaps.csl
index cf2745e8ee..a936bba123 100644
--- a/infoclio-fr-nocaps.csl
+++ b/infoclio-fr-nocaps.csl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-FR" version="1.0"
-       delimiter-precedes-last="never" delimiter-precedes-et-al="never" and="text">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-FR" version="1.0" delimiter-precedes-last="never" delimiter-precedes-et-al="never" and="text">
   <info>
     <title>Infoclio (sans majuscules, French)</title>
     <id>http://www.zotero.org/styles/infoclio-fr-nocaps</id>
@@ -50,7 +49,6 @@
       <term name="number-of-volumes" form="short">vol.</term>
     </terms>
   </locale>
-
   <citation>
     <layout suffix="." delimiter="&#160;; ">
       <choose>
@@ -72,7 +70,6 @@
       </choose>
     </layout>
   </citation>
-
   <bibliography>
     <sort>
       <key macro="creator" names-min="3" names-use-first="3"/>
@@ -82,7 +79,6 @@
       <text macro="complete-reference"/>
     </layout>
   </bibliography>
-
   <macro name="complete-reference">
     <group delimiter=". ">
       <group delimiter=", ">
@@ -117,7 +113,6 @@
       <text macro="url-non-web-documents"/>
     </group>
   </macro>
-
   <macro name="subsequent-reference">
     <group delimiter=", ">
       <text macro="creator-for-subsequent"/>
@@ -127,12 +122,9 @@
       <text macro="locator"/>
     </group>
   </macro>
-
   <macro name="creator">
     <names variable="author">
-      <name sort-separator=" "
-            name-as-sort-order="all"
-            et-al-min="4" et-al-use-first="3"/>
+      <name sort-separator=" " name-as-sort-order="all" et-al-min="4" et-al-use-first="3"/>
       <label form="short" prefix="&#160;(" suffix=")"/>
       <et-al font-style="italic"/>
       <substitute>
@@ -142,11 +134,9 @@
       </substitute>
     </names>
   </macro>
-
   <macro name="creator-for-subsequent">
     <names variable="author">
-      <name form="short"
-            et-al-min="4" et-al-use-first="1"/>
+      <name form="short" et-al-min="4" et-al-use-first="1"/>
       <label form="short" prefix="&#160;(" suffix=")"/>
       <et-al font-style="italic"/>
       <substitute>
@@ -156,18 +146,12 @@
       </substitute>
     </names>
   </macro>
-
   <macro name="title">
     <choose>
       <if type="book thesis graphic" match="any">
         <text variable="title" font-style="italic"/>
       </if>
-      <else-if type="article
-                     article-magazine article-newspaper article-journal
-                     entry entry-dictionary entry-encyclopedia
-                     report chapter paper-conference
-                     post post-weblog webpage
-                     song broadcast" match="any">
+      <else-if type="article                      article-magazine article-newspaper article-journal                      entry entry-dictionary entry-encyclopedia                      report chapter paper-conference                      post post-weblog webpage                      song broadcast" match="any">
         <text variable="title" quotes="true"/>
       </else-if>
       <else-if type="motion_picture">
@@ -185,7 +169,6 @@
       </else>
     </choose>
   </macro>
-
   <macro name="identifier-for-subsequent">
     <choose>
       <if variable="title title-short" match="any">
@@ -193,12 +176,7 @@
           <if type="book thesis graphic" match="any">
             <text variable="title" font-style="italic" form="short"/>
           </if>
-          <else-if type="article
-                         article-magazine article-newspaper article-journal
-                         entry entry-dictionary entry-encyclopedia
-                         report chapter paper-conference
-                         post post-weblog webpage
-                         song broadcast" match="any">
+          <else-if type="article                          article-magazine article-newspaper article-journal                          entry entry-dictionary entry-encyclopedia                          report chapter paper-conference                          post post-weblog webpage                          song broadcast" match="any">
             <text variable="title" quotes="true" form="short"/>
           </else-if>
           <else-if type="motion_picture">
@@ -233,55 +211,41 @@
           <et-al font-style="italic"/>
         </names>
       </else-if>
-      <else-if type="report song broadcast motion_picture
-                     webpage post post-weblog" match="any">
+      <else-if type="report song broadcast motion_picture                      webpage post post-weblog" match="any">
         <!-- these types have either collection-title or container-title -->
         <text variable="collection-title" font-style="italic"/>
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
-
   <macro name="op-cit">
-     <group font-style="italic" delimiter="&#160;" suffix=".">
+    <group font-style="italic" delimiter="&#160;" suffix=".">
       <choose>
-        <if type="article
-                  article-magazine article-newspaper article-journal
-                  entry entry-dictionary entry-encyclopedia
-                  chapter paper-conference
-                  post post-weblog" match="any">
+        <if type="article                   article-magazine article-newspaper article-journal                   entry entry-dictionary entry-encyclopedia                   chapter paper-conference                   post post-weblog" match="any">
           <text value="art."/>
         </if>
-        <else-if type="manuscript personal_communication interview
-                       report webpage" match="any">
+        <else-if type="manuscript personal_communication interview                        report webpage" match="any">
           <text value="doc."/>
         </else-if>
-        <else-if type="book thesis graphic
-                       motion_picture song broadcast" match="any">
+        <else-if type="book thesis graphic                        motion_picture song broadcast" match="any">
           <text value="op."/>
         </else-if>
       </choose>
       <text term="cited" form="short"/>
     </group>
   </macro>
-
   <macro name="in">
     <choose>
-      <if type="chapter paper-conference
-                entry-encyclopedia entry-dictionary"
-          match="any">
+      <if type="chapter paper-conference                 entry-encyclopedia entry-dictionary" match="any">
         <text term="in"/>
       </if>
     </choose>
   </macro>
-
   <macro name="container-creator">
     <choose>
       <if type="chapter paper-conference" match="any">
         <names variable="editor">
-          <name sort-separator=" "
-                name-as-sort-order="all"
-                et-al-min="4" et-al-use-first="3"/>
+          <name sort-separator=" " name-as-sort-order="all" et-al-min="4" et-al-use-first="3"/>
           <label form="short" prefix="&#160;(" suffix=")"/>
           <et-al font-style="italic"/>
           <substitute>
@@ -292,16 +256,12 @@
       </if>
     </choose>
   </macro>
-
   <macro name="container-information">
     <choose>
-      <if type="chapter paper-conference
-                entry-encyclopedia entry-dictionary
-                article-newspaper article-magazine article-journal" match="any">
+      <if type="chapter paper-conference                 entry-encyclopedia entry-dictionary                 article-newspaper article-magazine article-journal" match="any">
         <text variable="container-title" font-style="italic"/>
       </if>
-      <else-if type="report song broadcast motion_picture
-                     webpage post post-weblog" match="any">
+      <else-if type="report song broadcast motion_picture                      webpage post post-weblog" match="any">
         <group delimiter=", ">
           <text variable="genre"/>
           <!-- these types have either collection-title or container-title -->
@@ -311,7 +271,6 @@
       </else-if>
     </choose>
   </macro>
-  
   <macro name="journal-volume">
     <choose>
       <if type="article-journal">
@@ -325,12 +284,9 @@
       </else-if>
     </choose>
   </macro>
-  
   <macro name="volumes">
     <choose>
-      <if type="book chapter
-                entry-encyclopedia entry-dictionary
-                song motion_picture" match="any">
+      <if type="book chapter                 entry-encyclopedia entry-dictionary                 song motion_picture" match="any">
         <group delimiter=" / ">
           <group delimiter="&#160;">
             <label variable="volume" form="short"/>
@@ -348,7 +304,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="type-description">
     <choose>
       <if type="manuscript thesis speech" match="any">
@@ -395,13 +350,9 @@
       </else-if>
     </choose>
   </macro>
-
   <macro name="alt-publisher">
     <choose>
-      <if type="book chapter
-                thesis report
-                paper-conference
-                entry-dictionary entry-encyclopedia" match="none">
+      <if type="book chapter                 thesis report                 paper-conference                 entry-dictionary entry-encyclopedia" match="none">
         <!--
              label for songs,
              distributor for films,
@@ -411,11 +362,9 @@
       </if>
     </choose>
   </macro>
-
   <macro name="edition">
     <choose>
-      <if type="book chapter
-                entry-dictionary entry-encyclopedia" match="any">
+      <if type="book chapter                 entry-dictionary entry-encyclopedia" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter="&#160;">
@@ -430,7 +379,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="place">
     <choose>
       <if type="speech">
@@ -444,17 +392,13 @@
       </else>
     </choose>
   </macro>
-
   <macro name="publishing-house">
     <choose>
-      <if type="book chapter thesis report
-                paper-conference
-                entry-dictionary entry-encyclopedia" match="any">
+      <if type="book chapter thesis report                 paper-conference                 entry-dictionary entry-encyclopedia" match="any">
         <text variable="publisher"/>
       </if>
     </choose>
   </macro>
-
   <macro name="date">
     <choose>
       <if type="book chapter paper-conference thesis" match="any">
@@ -467,10 +411,7 @@
           </else>
         </choose>
       </if>
-      <else-if type="article-journal article-newspaper article-magazine
-                     graphic entry-encyclopedia entry-dictionary
-                     report speech interview
-                     manuscript personal_communication" match="any">
+      <else-if type="article-journal article-newspaper article-magazine                      graphic entry-encyclopedia entry-dictionary                      report speech interview                      manuscript personal_communication" match="any">
         <choose>
           <if variable="issued">
             <date variable="issued" form="numeric" date-parts="year-month-day"/>
@@ -485,7 +426,6 @@
       </else>
     </choose>
   </macro>
-
   <macro name="pages">
     <choose>
       <if variable="locator">
@@ -499,18 +439,15 @@
       </else>
     </choose>
   </macro>
-
   <macro name="locator">
     <group delimiter="&#160;">
       <label variable="locator" form="short"/>
       <text variable="locator"/>
     </group>
   </macro>
-
   <macro name="book-series">
     <choose>
-      <if type="book chapter paper-conference
-                entry-dictionary entry-encyclopedia" match="any">
+      <if type="book chapter paper-conference                 entry-dictionary entry-encyclopedia" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <text variable="collection-title"/>
           <choose>
@@ -522,7 +459,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="artwork-description">
     <choose>
       <if type="graphic">
@@ -534,7 +470,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="archive-location">
     <choose>
       <if variable="archive">
@@ -546,15 +481,13 @@
       </if>
     </choose>
   </macro>
-
   <macro name="url-web-documents-only">
     <choose>
       <if type="webpage post post-weblog">
-          <text macro="url"/>
+        <text macro="url"/>
       </if>
     </choose>
   </macro>
-
   <macro name="url-non-web-documents">
     <choose>
       <if variable="DOI">
@@ -582,7 +515,6 @@
       </else-if>
     </choose>
   </macro>
-
   <macro name="url">
     <group delimiter=", ">
       <text variable="URL" prefix="&lt;" suffix="&gt;"/>
@@ -592,5 +524,4 @@
       </group>
     </group>
   </macro>
-
 </style>
diff --git a/infoclio-fr-smallcaps.csl b/infoclio-fr-smallcaps.csl
index 003f25998d..8e983797a3 100644
--- a/infoclio-fr-smallcaps.csl
+++ b/infoclio-fr-smallcaps.csl
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-FR" version="1.0"
-       delimiter-precedes-last="never" delimiter-precedes-et-al="never" and="text">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="fr-FR" version="1.0" delimiter-precedes-last="never" delimiter-precedes-et-al="never" and="text">
   <info>
     <title>Infoclio (petites majuscules, French)</title>
     <id>http://www.zotero.org/styles/infoclio-fr-smallcaps</id>
@@ -49,7 +48,6 @@
       <term name="number-of-volumes" form="short">vol.</term>
     </terms>
   </locale>
-
   <citation>
     <layout suffix="." delimiter="&#160;; ">
       <choose>
@@ -71,7 +69,6 @@
       </choose>
     </layout>
   </citation>
-
   <bibliography>
     <sort>
       <key macro="creator" names-min="3" names-use-first="3"/>
@@ -81,7 +78,6 @@
       <text macro="complete-reference"/>
     </layout>
   </bibliography>
-
   <macro name="complete-reference">
     <group delimiter=". ">
       <group delimiter=", ">
@@ -116,7 +112,6 @@
       <text macro="url-non-web-documents"/>
     </group>
   </macro>
-
   <macro name="subsequent-reference">
     <group delimiter=", ">
       <text macro="creator-for-subsequent"/>
@@ -126,12 +121,9 @@
       <text macro="locator"/>
     </group>
   </macro>
-
   <macro name="creator">
     <names variable="author">
-      <name sort-separator=" "
-            name-as-sort-order="all"
-            et-al-min="4" et-al-use-first="3">
+      <name sort-separator=" " name-as-sort-order="all" et-al-min="4" et-al-use-first="3">
         <name-part name="family" font-variant="small-caps"/>
       </name>
       <label form="short" prefix="&#160;(" suffix=")"/>
@@ -143,11 +135,9 @@
       </substitute>
     </names>
   </macro>
-
   <macro name="creator-for-subsequent">
     <names variable="author">
-      <name form="short"
-            et-al-min="4" et-al-use-first="1">
+      <name form="short" et-al-min="4" et-al-use-first="1">
         <name-part name="family" font-variant="small-caps"/>
       </name>
       <label form="short" prefix="&#160;(" suffix=")"/>
@@ -159,18 +149,12 @@
       </substitute>
     </names>
   </macro>
-
   <macro name="title">
     <choose>
       <if type="book thesis graphic" match="any">
         <text variable="title" font-style="italic"/>
       </if>
-      <else-if type="article
-                     article-magazine article-newspaper article-journal
-                     entry entry-dictionary entry-encyclopedia
-                     report chapter paper-conference
-                     post post-weblog webpage
-                     song broadcast" match="any">
+      <else-if type="article                      article-magazine article-newspaper article-journal                      entry entry-dictionary entry-encyclopedia                      report chapter paper-conference                      post post-weblog webpage                      song broadcast" match="any">
         <text variable="title" quotes="true"/>
       </else-if>
       <else-if type="motion_picture">
@@ -188,7 +172,6 @@
       </else>
     </choose>
   </macro>
-
   <macro name="identifier-for-subsequent">
     <choose>
       <if variable="title title-short" match="any">
@@ -196,12 +179,7 @@
           <if type="book thesis graphic" match="any">
             <text variable="title" font-style="italic" form="short"/>
           </if>
-          <else-if type="article
-                         article-magazine article-newspaper article-journal
-                         entry entry-dictionary entry-encyclopedia
-                         report chapter paper-conference
-                         post post-weblog webpage
-                         song broadcast" match="any">
+          <else-if type="article                          article-magazine article-newspaper article-journal                          entry entry-dictionary entry-encyclopedia                          report chapter paper-conference                          post post-weblog webpage                          song broadcast" match="any">
             <text variable="title" quotes="true" form="short"/>
           </else-if>
           <else-if type="motion_picture">
@@ -236,55 +214,41 @@
           <et-al font-style="italic"/>
         </names>
       </else-if>
-      <else-if type="report song broadcast motion_picture
-                     webpage post post-weblog" match="any">
+      <else-if type="report song broadcast motion_picture                      webpage post post-weblog" match="any">
         <!-- these types have either collection-title or container-title -->
         <text variable="collection-title" font-style="italic"/>
         <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
-
   <macro name="op-cit">
-     <group font-style="italic" delimiter="&#160;" suffix=".">
+    <group font-style="italic" delimiter="&#160;" suffix=".">
       <choose>
-        <if type="article
-                  article-magazine article-newspaper article-journal
-                  entry entry-dictionary entry-encyclopedia
-                  chapter paper-conference
-                  post post-weblog" match="any">
+        <if type="article                   article-magazine article-newspaper article-journal                   entry entry-dictionary entry-encyclopedia                   chapter paper-conference                   post post-weblog" match="any">
           <text value="art."/>
         </if>
-        <else-if type="manuscript personal_communication interview
-                       report webpage" match="any">
+        <else-if type="manuscript personal_communication interview                        report webpage" match="any">
           <text value="doc."/>
         </else-if>
-        <else-if type="book thesis graphic
-                       motion_picture song broadcast" match="any">
+        <else-if type="book thesis graphic                        motion_picture song broadcast" match="any">
           <text value="op."/>
         </else-if>
       </choose>
       <text term="cited" form="short"/>
     </group>
   </macro>
-
   <macro name="in">
     <choose>
-      <if type="chapter paper-conference
-                entry-encyclopedia entry-dictionary"
-          match="any">
+      <if type="chapter paper-conference                 entry-encyclopedia entry-dictionary" match="any">
         <text term="in"/>
       </if>
     </choose>
   </macro>
-
   <macro name="container-creator">
     <choose>
       <if type="chapter paper-conference" match="any">
         <names variable="editor">
-          <name sort-separator=" "
-                name-as-sort-order="all"
-                et-al-min="4" et-al-use-first="3">
+          <name sort-separator=" " name-as-sort-order="all" et-al-min="4" et-al-use-first="3">
             <name-part name="family" font-variant="small-caps"/>
           </name>
           <label form="short" prefix="&#160;(" suffix=")"/>
@@ -297,16 +261,12 @@
       </if>
     </choose>
   </macro>
-
   <macro name="container-information">
     <choose>
-      <if type="chapter paper-conference
-                entry-encyclopedia entry-dictionary
-                article-newspaper article-magazine article-journal" match="any">
+      <if type="chapter paper-conference                 entry-encyclopedia entry-dictionary                 article-newspaper article-magazine article-journal" match="any">
         <text variable="container-title" font-style="italic"/>
       </if>
-      <else-if type="report song broadcast motion_picture
-                     webpage post post-weblog" match="any">
+      <else-if type="report song broadcast motion_picture                      webpage post post-weblog" match="any">
         <group delimiter=", ">
           <text variable="genre"/>
           <!-- these types have either collection-title or container-title -->
@@ -316,7 +276,6 @@
       </else-if>
     </choose>
   </macro>
-  
   <macro name="journal-volume">
     <choose>
       <if type="article-journal">
@@ -330,12 +289,9 @@
       </else-if>
     </choose>
   </macro>
-  
   <macro name="volumes">
     <choose>
-      <if type="book chapter
-                entry-encyclopedia entry-dictionary
-                song motion_picture" match="any">
+      <if type="book chapter                 entry-encyclopedia entry-dictionary                 song motion_picture" match="any">
         <group delimiter=" / ">
           <group delimiter="&#160;">
             <label variable="volume" form="short"/>
@@ -353,7 +309,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="type-description">
     <choose>
       <if type="manuscript thesis speech" match="any">
@@ -400,13 +355,9 @@
       </else-if>
     </choose>
   </macro>
-
   <macro name="alt-publisher">
     <choose>
-      <if type="book chapter
-                thesis report
-                paper-conference
-                entry-dictionary entry-encyclopedia" match="none">
+      <if type="book chapter                 thesis report                 paper-conference                 entry-dictionary entry-encyclopedia" match="none">
         <!--
              label for songs,
              distributor for films,
@@ -416,11 +367,9 @@
       </if>
     </choose>
   </macro>
-
   <macro name="edition">
     <choose>
-      <if type="book chapter
-                entry-dictionary entry-encyclopedia" match="any">
+      <if type="book chapter                 entry-dictionary entry-encyclopedia" match="any">
         <choose>
           <if is-numeric="edition">
             <group delimiter="&#160;">
@@ -435,7 +384,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="place">
     <choose>
       <if type="speech">
@@ -449,17 +397,13 @@
       </else>
     </choose>
   </macro>
-
   <macro name="publishing-house">
     <choose>
-      <if type="book chapter thesis report
-                paper-conference
-                entry-dictionary entry-encyclopedia" match="any">
+      <if type="book chapter thesis report                 paper-conference                 entry-dictionary entry-encyclopedia" match="any">
         <text variable="publisher"/>
       </if>
     </choose>
   </macro>
-
   <macro name="date">
     <choose>
       <if type="book chapter paper-conference thesis" match="any">
@@ -472,10 +416,7 @@
           </else>
         </choose>
       </if>
-      <else-if type="article-journal article-newspaper article-magazine
-                     graphic entry-encyclopedia entry-dictionary
-                     report speech interview
-                     manuscript personal_communication" match="any">
+      <else-if type="article-journal article-newspaper article-magazine                      graphic entry-encyclopedia entry-dictionary                      report speech interview                      manuscript personal_communication" match="any">
         <choose>
           <if variable="issued">
             <date variable="issued" form="numeric" date-parts="year-month-day"/>
@@ -490,7 +431,6 @@
       </else>
     </choose>
   </macro>
-
   <macro name="pages">
     <choose>
       <if variable="locator">
@@ -504,18 +444,15 @@
       </else>
     </choose>
   </macro>
-
   <macro name="locator">
     <group delimiter="&#160;">
       <label variable="locator" form="short"/>
       <text variable="locator"/>
     </group>
   </macro>
-
   <macro name="book-series">
     <choose>
-      <if type="book chapter paper-conference
-                entry-dictionary entry-encyclopedia" match="any">
+      <if type="book chapter paper-conference                 entry-dictionary entry-encyclopedia" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <text variable="collection-title"/>
           <choose>
@@ -527,7 +464,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="artwork-description">
     <choose>
       <if type="graphic">
@@ -539,7 +475,6 @@
       </if>
     </choose>
   </macro>
-
   <macro name="archive-location">
     <choose>
       <if variable="archive">
@@ -551,15 +486,13 @@
       </if>
     </choose>
   </macro>
-
   <macro name="url-web-documents-only">
     <choose>
       <if type="webpage post post-weblog">
-          <text macro="url"/>
+        <text macro="url"/>
       </if>
     </choose>
   </macro>
-
   <macro name="url-non-web-documents">
     <choose>
       <if variable="DOI">
@@ -587,7 +520,6 @@
       </else-if>
     </choose>
   </macro>
-
   <macro name="url">
     <group delimiter=", ">
       <text variable="URL" prefix="&lt;" suffix="&gt;"/>
@@ -597,5 +529,4 @@
       </group>
     </group>
   </macro>
-
 </style>
diff --git a/instituto-de-pesquisas-tecnologicas.csl b/instituto-de-pesquisas-tecnologicas.csl
index 77f1da2909..7ebac61c4c 100644
--- a/instituto-de-pesquisas-tecnologicas.csl
+++ b/instituto-de-pesquisas-tecnologicas.csl
@@ -1,12 +1,12 @@
 <?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="pt-BR">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Instituto de Pesquisas Tecnológicas (Portuguese - Brazil)</title>
     <title-short>IPT</title-short>
     <id>http://www.zotero.org/styles/instituto-de-pesquisas-tecnologicas</id>
-    <link rel="self" href="http://www.zotero.org/styles/instituto-de-pesquisas-tecnologicas"/>
-    <link rel="documentation" href="http://www.ipt.br/en"/>
+    <link href="http://www.zotero.org/styles/instituto-de-pesquisas-tecnologicas" rel="self"/>
+    <link href="http://www.ipt.br/en" rel="documentation"/>
     <author>
       <name>Samuel Barsanelli Costa</name>
       <email>sbcosta@ipt.br</email>
@@ -14,7 +14,7 @@
     <category citation-format="author-date"/>
     <summary>Standard for citations and references used by the Institute for Technological Research of the State of Sao Paulo - IPT, Brazil, in accordance with the Brazilian Association of Technical Standards ABNT NBR 6023:2000</summary>
     <updated>2015-11-13T11:58:43+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>
+    <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>
   <citation>
     <sort>
diff --git a/instituto-superior-de-teologia-de-las-islas-canarias.csl b/instituto-superior-de-teologia-de-las-islas-canarias.csl
index bf8c6ae7e6..36499df7b2 100644
--- a/instituto-superior-de-teologia-de-las-islas-canarias.csl
+++ b/instituto-superior-de-teologia-de-las-islas-canarias.csl
@@ -6,11 +6,11 @@
     <id>http://www.zotero.org/styles/instituto-superior-de-teologia-de-las-islas-canarias</id>
     <link href="http://www.zotero.org/styles/instituto-superior-de-teologia-de-las-islas-canarias" rel="self"/>
     <link href="http://www.istic.es" rel="documentation"/>
-     <author>
+    <author>
       <name>Juan Jesús García</name>
       <email>jacintonp@gmail.com</email>
     </author>
-      <category citation-format="note"/>
+    <category citation-format="note"/>
     <category field="theology"/>
     <summary>Según los criterios de la guía de estilo del Istic</summary>
     <updated>2015-11-24T22:19:09-06:00</updated>
@@ -18,10 +18,10 @@
   </info>
   <locale>
     <terms>
-    <term name="ibid">ibídem</term>
-    <term name="in">en</term>
-    <term name="accessed">consulta</term>
-    <term name="reference" form="short">
+      <term name="ibid">ibídem</term>
+      <term name="in">en</term>
+      <term name="accessed">consulta</term>
+      <term name="reference" form="short">
         <single>ref.</single>
         <multiple>refs.</multiple>
       </term>
@@ -136,7 +136,7 @@
   <macro name="access">
     <choose>
       <if variable="URL">
-      <text variable="URL"/>
+        <text variable="URL"/>
         <group>
           <text term="accessed" text-case="capitalize-first" prefix=" [" suffix=":"/>
           <date variable="accessed" prefix=" " suffix="]">
@@ -152,21 +152,20 @@
     <choose>
       <if type="bill book graphic legal_case motion_picture report song" match="any">
         <text variable="title" font-style="italic"/>
- 
-   </if>
+      </if>
       <else>
         <text variable="title" quotes="true"/>
-     </else>
+      </else>
     </choose>
   </macro>
   <macro name="title-short">
     <choose>
       <if type="bill book graphic legal_case motion_picture report song" match="any">
         <text variable="title" font-style="italic" form="short"/>
-    </if>
+      </if>
       <else>
         <text variable="title" quotes="true" form="short"/>
-    </else>
+      </else>
     </choose>
   </macro>
   <macro name="publisher">
@@ -254,7 +253,7 @@
       <if is-numeric="edition">
         <text variable="edition" prefix=" " vertical-align="sup"/>
         <text macro="issued"/>
-        </if>
+      </if>
       <else>
         <text variable="edition" prefix=", "/>
         <choose>
@@ -278,7 +277,8 @@
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" text-case="capitalize-first" font-style="italic"/>      </else-if>
+          <text term="ibid" text-case="capitalize-first" font-style="italic"/>
+        </else-if>
         <else-if position="subsequent">
           <group delimiter=", ">
             <group>
@@ -391,7 +391,7 @@
           </choose>
           <choose>
             <if type="webpage">
-             <text macro="access" prefix=" "/>
+              <text macro="access" prefix=" "/>
             </if>
           </choose>
         </else>
diff --git a/international-journal-of-food-science-and-technology.csl b/international-journal-of-food-science-and-technology.csl
index 6325f7e210..ec57783e72 100644
--- a/international-journal-of-food-science-and-technology.csl
+++ b/international-journal-of-food-science-and-technology.csl
@@ -194,7 +194,7 @@
       </else-if>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix"  year-suffix-delimiter=",">
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix" year-suffix-delimiter=",">
     <sort>
       <key macro="issued"/>
       <key macro="author"/>
diff --git a/international-journal-of-quantum-chemistry.csl b/international-journal-of-quantum-chemistry.csl
index ec9bac3140..a31415b67b 100644
--- a/international-journal-of-quantum-chemistry.csl
+++ b/international-journal-of-quantum-chemistry.csl
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>International Journal of Quantum Chemistry</title>
     <id>http://www.zotero.org/styles/international-journal-of-quantum-chemistry</id>
     <link href="http://www.zotero.org/styles/international-journal-of-quantum-chemistry" rel="self"/>
+    <link href="http://onlinelibrary.wiley.com/journal/10.1002/(ISSN)1097-461X" rel="documentation"/>
     <author>
       <name>Ji Young Park</name>
       <email>mutnauq7@gmail.com</email>
@@ -15,7 +16,6 @@
     <summary>International Journal of Quantum Chemistry style.</summary>
     <updated>2015-09-30T01:02:53+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>
-    <link href="http://onlinelibrary.wiley.com/journal/10.1002/(ISSN)1097-461X" rel="documentation"/>
   </info>
   <macro name="editor">
     <names variable="editor">
diff --git a/journal-of-business-logistics.csl b/journal-of-business-logistics.csl
index 65f05adccb..4e37f5cb76 100644
--- a/journal-of-business-logistics.csl
+++ b/journal-of-business-logistics.csl
@@ -2,23 +2,22 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-US">
   <info>
     <title>Journal of Business Logistics</title>
-	<title-short>JBL</title-short>
-	<eissn>2158-1592</eissn>
+    <title-short>JBL</title-short>
     <id>http://www.zotero.org/styles/journal-of-business-logistics</id>
-	<link href="http://www.zotero.org/styles/journal-of-business-logistics" rel="self"/>
-	<link href="http://onlinelibrary.wiley.com/journal/10.1002/(ISSN)2158-1592/homepage/ForAuthors.html"  rel="documentation"/>
-	<link href="http://www.zotero.org/styles/chicago-author-date" rel="template"/>
-	<author>
+    <link href="http://www.zotero.org/styles/journal-of-business-logistics" rel="self"/>
+    <link href="http://www.zotero.org/styles/chicago-author-date" rel="template"/>
+    <link href="http://onlinelibrary.wiley.com/journal/10.1002/(ISSN)2158-1592/homepage/ForAuthors.html" rel="documentation"/>
+    <author>
       <name>Yousef Abdulsalam</name>
       <email>y.abdulsalam@asu.edu</email>
     </author>
     <category citation-format="author-date"/>
     <category field="social_science"/>
+    <eissn>2158-1592</eissn>
     <summary>A Chicago style variant specifically for the Journal of Business Logistics</summary>
     <updated>2015-09-13T23:05:28+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>
+    <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="editor" form="verb-short">ed.</term>
@@ -152,7 +151,7 @@
       </choose>
       <choose>
         <if type="legal_case" match="none">
-                <text variable="URL"/>
+          <text variable="URL"/>
         </if>
       </choose>
     </group>
@@ -502,7 +501,7 @@
       </group>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7"  entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" entry-spacing="0">
     <sort>
       <key macro="contributors"/>
       <key variable="issued"/>
diff --git a/journal-of-cellular-and-molecular-medicine.csl b/journal-of-cellular-and-molecular-medicine.csl
index 3dcc1bd95f..ebd65cf2eb 100644
--- a/journal-of-cellular-and-molecular-medicine.csl
+++ b/journal-of-cellular-and-molecular-medicine.csl
@@ -123,7 +123,7 @@
                 <text variable="page" form="short" prefix=" "/>
               </if>
               <else>
-		<text variable="DOI" form="short" prefix=" DOI: "/>
+                <text variable="DOI" form="short" prefix=" DOI: "/>
               </else>
             </choose>
           </group>
diff --git a/journal-of-peace-research.csl b/journal-of-peace-research.csl
index 8014b2f215..15c2125741 100644
--- a/journal-of-peace-research.csl
+++ b/journal-of-peace-research.csl
@@ -29,7 +29,7 @@
       <label form="short" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
-	<text macro="title"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
@@ -38,11 +38,11 @@
       <name form="short" and="symbol" delimiter=", " delimiter-precedes-last="never" initialize-with="" initialize="false"/>
       <substitute>
         <names variable="editor"/>
-	<text macro="title"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
-    <macro name="container-contributors">
+  <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
         <names variable="editor translator" delimiter=", ">
@@ -79,18 +79,18 @@
     <group delimiter=". ">
       <choose>
         <if type="report" match="any">
-	  <group delimiter=" ">
-	    <text variable="genre"/>
-	    <text variable="number"/>
-	  </group>
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
         </if>
-	<else>
-	  <text macro="event"/>
-	</else>
+        <else>
+          <text macro="event"/>
+        </else>
       </choose>
       <choose>
         <if type="article-journal article-magazine article-newspaper" match="none">
-          <group delimiter=", ">             
+          <group delimiter=", ">
             <group delimiter=": ">
               <text variable="publisher-place"/>
               <text variable="publisher"/>
@@ -156,7 +156,7 @@
     <choose>
       <if is-numeric="edition">
         <group delimiter=" ">
-          <number  variable="edition" form="ordinal"/>
+          <number variable="edition" form="ordinal"/>
           <text term="edition" form="short"/>
         </group>
       </if>
@@ -168,19 +168,19 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine" match="any">
-        <group  delimiter=": ">
+        <group delimiter=": ">
           <group>
             <text variable="volume"/>
-	    <choose>
-	      <if variable="issue">
-		<text variable="issue" prefix="(" suffix=")"/>
-	      </if>
-	      <else>
-		<date variable="issued" prefix="(" suffix=")">
-		  <date-part name="month"/>
-		</date>
-	      </else>
-	    </choose>
+            <choose>
+              <if variable="issue">
+                <text variable="issue" prefix="(" suffix=")"/>
+              </if>
+              <else>
+                <date variable="issued" prefix="(" suffix=")">
+                  <date-part name="month"/>
+                </date>
+              </else>
+            </choose>
           </group>
           <text variable="page"/>
         </group>
@@ -195,7 +195,7 @@
         </group>
       </else-if>
       <else-if type="book report chapter paper-conference" match="any">
-        <group  delimiter=", ">
+        <group delimiter=", ">
           <text macro="edition"/>
           <group>
             <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
@@ -208,13 +208,13 @@
   <macro name="citation-locator">
     <choose>
       <if locator="page">
-	<text variable="locator" prefix=" "/>
+        <text variable="locator" prefix=" "/>
       </if>
       <else>
-	<group delimiter=" ">
-	  <label variable="locator" form="short"/>
-	  <text variable="locator"/>
-	</group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
       </else>
     </choose>
   </macro>
@@ -239,7 +239,7 @@
       <key macro="author-short"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=": ">      
+      <group delimiter=": ">
         <group delimiter=", ">
           <text macro="author-short"/>
           <text macro="issued-year"/>
diff --git a/journal-of-physical-therapy-science.csl b/journal-of-physical-therapy-science.csl
index f9ee0feffc..e4a9183899 100644
--- a/journal-of-physical-therapy-science.csl
+++ b/journal-of-physical-therapy-science.csl
@@ -21,12 +21,12 @@
       <term name="page" form="short">
         <single>p</single>
         <multiple>p</multiple>
-    </term>
-    <term name="number-of-pages" form="short">
+      </term>
+      <term name="number-of-pages" form="short">
         <single>p</single>
         <multiple>pp</multiple>
-    </term>
-  </terms>
+      </term>
+    </terms>
   </locale>
   <macro name="accessed">
     <choose>
@@ -43,7 +43,7 @@
   <macro name="page">
     <choose>
       <if type="chapter paper-conference report" match="any">
-         <label variable="page" form="short" suffix=" "/>
+        <label variable="page" form="short" suffix=" "/>
       </if>
     </choose>
     <text variable="page"/>
@@ -52,7 +52,6 @@
     <label variable="number-of-pages" form="short" suffix=" "/>
     <text variable="number-of-pages"/>
   </macro>
-  
   <macro name="author">
     <names variable="author" suffix=": ">
       <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
@@ -72,19 +71,19 @@
   <macro name="container-title">
     <choose>
       <if type="chapter paper-conference" match="any">
-         <text term="in" text-case="capitalize-first" suffix=": "/>
-         <group delimiter=" ">
+        <text term="in" text-case="capitalize-first" suffix=": "/>
+        <group delimiter=" ">
           <text variable="container-title"/>
           <text variable="event"/>
         </group>
       </if>
       <else-if type="article article-magazine article-newspaper article-journal" match="any">
-         <text variable="container-title" form="short" strip-periods="true"/>
+        <text variable="container-title" form="short" strip-periods="true"/>
       </else-if>
       <else>
-          <text variable="container-title"/>
+        <text variable="container-title"/>
       </else>
-    </choose>     
+    </choose>
   </macro>
   <macro name="title">
     <choose>
@@ -104,8 +103,8 @@
         </group>
       </else-if>
       <else>
-       <group delimiter=", " suffix=". ">
-        <text variable="title"/>
+        <group delimiter=", " suffix=". ">
+          <text variable="title"/>
           <group delimiter=" ">
             <text variable="collection-title"/>
             <text variable="collection-number"/>
@@ -137,88 +136,88 @@
   </citation>
   <bibliography et-al-min="4" et-al-use-first="3" delimiter-precedes-et-al="always" second-field-align="flush" entry-spacing="0">
     <layout>
-      <group  vertical-align="sup">
+      <group vertical-align="sup">
         <text variable="citation-number" suffix=") "/>
       </group>
       <choose>
         <if type="webpage">
           <text macro="title"/>
           <text variable="URL"/>
-          <text macro="accessed" prefix=" (" suffix=")"/> 
+          <text macro="accessed" prefix=" (" suffix=")"/>
         </if>
         <else>
-        <group suffix=".">
-          <text macro="author"/>
-          <text macro="title"/>
-          <choose>
-            <if type="bill graphic legal_case legislation motion_picture report song" match="any">
-              <group delimiter=" ">
-                <text macro="edition"/>
-                <text macro="publisher"/>
-              </group>
-              <text macro="container-title" suffix=", "/>
-              <group delimiter=", ">
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <group  delimiter=": "> 
-                  <text variable="volume"/>
+          <group suffix=".">
+            <text macro="author"/>
+            <text macro="title"/>
+            <choose>
+              <if type="bill graphic legal_case legislation motion_picture report song" match="any">
+                <group delimiter=" ">
+                  <text macro="edition"/>
+                  <text macro="publisher"/>
+                </group>
+                <text macro="container-title" suffix=", "/>
+                <group delimiter=", ">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <group delimiter=": ">
+                    <text variable="volume"/>
+                    <text macro="page"/>
+                  </group>
+                </group>
+              </if>
+              <else-if type="book">
+                <group delimiter=" ">
+                  <text macro="edition"/>
+                  <text macro="publisher"/>
+                </group>
+                <text macro="container-title" suffix=", "/>
+                <group delimiter=", ">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <text macro="numpage"/>
+                </group>
+              </else-if>
+              <else-if type="chapter paper-conference" match="any">
+                <text macro="editor"/>
+                <text macro="container-title" suffix=". "/>
+                <group delimiter=" ">
+                  <text macro="edition"/>
+                  <text macro="publisher"/>
+                </group>
+                <group delimiter=", ">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
                   <text macro="page"/>
                 </group>
-              </group>
-            </if>
-            <else-if type="book">
-              <group delimiter=" ">
-                <text macro="edition"/>
+              </else-if>
+              <else-if type="thesis">
                 <text macro="publisher"/>
-              </group>
-              <text macro="container-title" suffix=", "/>
-              <group delimiter=", ">
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text macro="numpage"/>
-              </group>
-            </else-if>
-            <else-if type="chapter paper-conference" match="any">
-              <text macro="editor"/>
-              <text macro="container-title"  suffix=". "/>
-              <group delimiter=" ">
-                <text macro="edition"/>
+                <group delimiter=", ">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <text macro="numpage"/>
+                </group>
+              </else-if>
+              <else>
+                <text macro="container-title" suffix=", "/>
                 <text macro="publisher"/>
-              </group>
-              <group delimiter=", ">
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text macro="page"/>
-              </group>
-            </else-if>
-            <else-if type="thesis">
-              <text macro="publisher"/>
-              <group delimiter=", ">
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text macro="numpage"/>
-              </group>
-            </else-if>
-            <else>
-              <text macro="container-title" suffix=", "/>
-              <text macro="publisher"/>
-              <group delimiter=", ">
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <group  delimiter=": "> 
-                  <text variable="volume"/>
-                  <text macro="page"/>
+                <group delimiter=", ">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <group delimiter=": ">
+                    <text variable="volume"/>
+                    <text macro="page"/>
+                  </group>
                 </group>
-              </group>
-            </else>
-          </choose>
-        </group>  
-        </else>  
+              </else>
+            </choose>
+          </group>
+        </else>
       </choose>
     </layout>
   </bibliography>
diff --git a/journal-of-product-innovation-management.csl b/journal-of-product-innovation-management.csl
index c5bd34d8e6..43f574c72e 100644
--- a/journal-of-product-innovation-management.csl
+++ b/journal-of-product-innovation-management.csl
@@ -127,13 +127,13 @@
   <macro name="access">
     <choose>
       <if type="webpage post-weblog" match="any">
-	<group delimiter=": ">
-	  <text term="available at" text-case="capitalize-first"/>
-	  <text variable="URL"/>
-	</group>
+        <group delimiter=": ">
+          <text term="available at" text-case="capitalize-first"/>
+          <text variable="URL"/>
+        </group>
       </if>
     </choose>
-  </macro>  
+  </macro>
   <macro name="title">
     <choose>
       <if variable="title" match="none">
@@ -184,10 +184,10 @@
   <macro name="locators">
     <choose>
       <if type="article-journal">
-	<group prefix=" " delimiter=" ">
+        <group prefix=" " delimiter=" ">
           <text variable="volume"/>
-	  <text variable="issue" prefix="(" suffix=")"/>
-	</group>
+          <text variable="issue" prefix="(" suffix=")"/>
+        </group>
       </if>
       <else-if type="legal_case">
         <text variable="volume" prefix=", "/>
@@ -419,21 +419,21 @@
     </sort>
     <layout>
       <group suffix=".">
-	<group delimiter=". ">
+        <group delimiter=". ">
           <text macro="contributors"/>
           <text macro="date"/>
           <text macro="title"/>
-	</group>
-	<text macro="description"/>
-	<text macro="secondary-contributors" prefix=". "/>
-	<text macro="container-title" prefix=". "/>
-	<text macro="container-contributors"/>
-	<text macro="edition"/>
-	<text macro="locators-chapter"/>
-	<text macro="locators"/>
-	<text macro="collection-title" prefix=". "/>
-	<text macro="issue"/>
-	<text macro="locators-article"/>
+        </group>
+        <text macro="description"/>
+        <text macro="secondary-contributors" prefix=". "/>
+        <text macro="container-title" prefix=". "/>
+        <text macro="container-contributors"/>
+        <text macro="edition"/>
+        <text macro="locators-chapter"/>
+        <text macro="locators"/>
+        <text macro="collection-title" prefix=". "/>
+        <text macro="issue"/>
+        <text macro="locators-article"/>
       </group>
       <text macro="access" prefix=" "/>
     </layout>
diff --git a/journal-of-thrombosis-and-haemostasis.csl b/journal-of-thrombosis-and-haemostasis.csl
index 005cc4226b..9a85367928 100644
--- a/journal-of-thrombosis-and-haemostasis.csl
+++ b/journal-of-thrombosis-and-haemostasis.csl
@@ -75,7 +75,7 @@
       <else-if type="bill legislation" match="any">
         <group delimiter=", ">
           <group delimiter=".">
-            <text variable="container-title"  font-style="italic"/>
+            <text variable="container-title" font-style="italic"/>
             <group delimiter=" ">
               <text term="section" form="short" text-case="capitalize-first"/>
               <text variable="section"/>
@@ -118,7 +118,7 @@
   <macro name="date">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <date variable="issued"  suffix="; ">
+        <date variable="issued" suffix="; ">
           <date-part name="year"/>
         </date>
       </if>
@@ -186,7 +186,7 @@
       </group>
       <group delimiter=" " suffix=". ">
         <text macro="editor"/>
-        <text macro="container-title" />
+        <text macro="container-title"/>
         <text macro="publisher"/>
         <group>
           <text macro="date"/>
diff --git a/lund-university-school-of-economics-and-management.csl b/lund-university-school-of-economics-and-management.csl
index a409b1f57d..8a7984a43e 100644
--- a/lund-university-school-of-economics-and-management.csl
+++ b/lund-university-school-of-economics-and-management.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="never" default-locale="en-GB">
   <info>
     <title>Lund University School of Economics and Management</title>
diff --git a/mcgill-en.csl b/mcgill-en.csl
index f9a4b4cf84..fe29f925cf 100644
--- a/mcgill-en.csl
+++ b/mcgill-en.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" version="1.0" class="note" default-locale="en-US">
   <info>
     <title>Canadian Guide to Uniform Legal Citation 7th edition (McGill Guide)</title>
diff --git a/modern-humanities-research-association-author-date.csl b/modern-humanities-research-association-author-date.csl
index 2105ca3e3f..043323ea0e 100644
--- a/modern-humanities-research-association-author-date.csl
+++ b/modern-humanities-research-association-author-date.csl
@@ -30,8 +30,8 @@
       <term name="edition" form="short">edn</term>
       <term name="translator" form="verb-short">trans. by</term>
       <term name="folio">
-	<single>fol.</single>
-	<multiple>fols</multiple>
+        <single>fol.</single>
+        <multiple>fols</multiple>
       </term>
     </terms>
   </locale>
@@ -67,10 +67,10 @@
     </choose>
   </macro>
   <macro name="editor-translator">
-      <names variable="editor translator" delimiter=", ">
-        <label form="verb-short" suffix=" "/>
-        <name and="text" delimiter=", " delimiter-precedes-last="never"/>
-      </names>
+    <names variable="editor translator" delimiter=", ">
+      <label form="verb-short" suffix=" "/>
+      <name and="text" delimiter=", " delimiter-precedes-last="never"/>
+    </names>
   </macro>
   <macro name="collection-title">
     <group delimiter=", ">
@@ -89,15 +89,15 @@
   <macro name="volume">
     <choose>
       <if type="article-journal">
-       	<choose>
-	  <if variable="volume">
-	    <!--testing for volume because issues w/o volume number have different format-->
-	    <group delimiter=".">
+        <choose>
+          <if variable="volume">
+            <!--testing for volume because issues w/o volume number have different format-->
+            <group delimiter=".">
               <text variable="volume"/>
-	      <text variable="issue"/>
-	    </group>
-	  </if>
-	</choose>
+              <text variable="issue"/>
+            </group>
+          </if>
+        </choose>
       </if>
       <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
         <group delimiter=", ">
diff --git a/modern-humanities-research-association.csl b/modern-humanities-research-association.csl
index f896364ad6..d5e749e19e 100644
--- a/modern-humanities-research-association.csl
+++ b/modern-humanities-research-association.csl
@@ -30,8 +30,8 @@
       <term name="edition" form="short">edn</term>
       <term name="translator" form="verb-short">trans. by</term>
       <term name="folio">
-	<single>fol.</single>
-	<multiple>fols</multiple>
+        <single>fol.</single>
+        <multiple>fols</multiple>
       </term>
     </terms>
   </locale>
@@ -177,15 +177,15 @@
   <macro name="locators-note">
     <choose>
       <if type="article-journal">
-	<choose>
-	  <if variable="volume">
-	    <!--testing for volume because issues w/o volume number have different format-->
-	    <group delimiter=".">
+        <choose>
+          <if variable="volume">
+            <!--testing for volume because issues w/o volume number have different format-->
+            <group delimiter=".">
               <text variable="volume"/>
-	      <text variable="issue"/>
-	    </group>
-	  </if>
-	</choose>
+              <text variable="issue"/>
+            </group>
+          </if>
+        </choose>
       </if>
       <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
         <group delimiter=", ">
diff --git a/molecular-plant-pathology.csl b/molecular-plant-pathology.csl
index 288c18d741..118cf530c9 100644
--- a/molecular-plant-pathology.csl
+++ b/molecular-plant-pathology.csl
@@ -147,7 +147,7 @@
             <group delimiter=" " suffix=",">
               <text variable="container-title" suffix="."/>
               <text macro="editor" suffix=")" prefix="("/>
-            </group>  
+            </group>
             <text variable="collection-title" suffix="."/>
             <group suffix="." delimiter=". ">
               <text macro="pages"/>
diff --git a/nehet.csl b/nehet.csl
index aa96b04965..8ac44829b2 100644
--- a/nehet.csl
+++ b/nehet.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" version="1.0" class="note" demote-non-dropping-particle="sort-only" default-locale="fr-FR" page-range-format="expanded">
   <info>
     <title>NeHeT (French)</title>
@@ -281,4 +281,4 @@
       </group>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/nowa-audiofonologia.csl b/nowa-audiofonologia.csl
index 99f8f5bd8d..ad430526d3 100644
--- a/nowa-audiofonologia.csl
+++ b/nowa-audiofonologia.csl
@@ -2,11 +2,11 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="pl-PL" page-range-format="minimal">
   <info>
     <title>Nowa Audiofonologia (Polish)</title>
-	<title-short>Now Audiofonol</title-short>
+    <title-short>Now Audiofonol</title-short>
     <id>http://www.zotero.org/styles/nowa-audiofonologia</id>
     <link href="http://www.zotero.org/styles/nowa-audiofonologia" rel="self"/>
     <link href="http://www.zotero.org/styles/plos" rel="template"/>
-	<link href="http://www.nowaaudiofonologia.pl/instructions" rel="documentation"/>
+    <link href="http://www.nowaaudiofonologia.pl/instructions" rel="documentation"/>
     <author>
       <name>Mateusz Rusiniak</name>
       <email>m.rusiniak@ifps.org.pl</email>
@@ -19,18 +19,14 @@
     <updated>2014-09-06T22:02:33+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>
-	<terms>
-	<term name="et-al">i wsp.</term>
-	</terms>
+    <terms>
+      <term name="et-al">i wsp.</term>
+    </terms>
   </locale>
-
   <macro name="editor">
     <names variable="editor" suffix=",">
-	  <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="contextual"/>
-     
-     
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="contextual"/>
     </names>
   </macro>
   <macro name="author">
@@ -49,7 +45,7 @@
   <macro name="publisher">
     <group>
       <text variable="publisher-place" suffix=": "/>
-      <text variable="publisher" />
+      <text variable="publisher"/>
     </group>
   </macro>
   <macro name="year-date">
@@ -64,7 +60,7 @@
       </else>
     </choose>
   </macro>
-   <citation collapse="citation-number">
+  <citation collapse="citation-number">
     <sort>
       <key variable="citation-number" sort="ascending"/>
     </sort>
@@ -82,23 +78,20 @@
             <text macro="title" suffix="." prefix=". "/>
             <text macro="publisher" prefix=" " suffix=""/>
             <text macro="year-date" prefix=", " suffix=""/>
-   			<text value="."/>
+            <text value="."/>
           </group>
         </if>
         <else-if type="chapter" match="any">
           <text macro="title" prefix=": " suffix="."/>
           <group prefix=" W:" delimiter=" " suffix="">
-			<text macro="editor" prefix=" " suffix=" red."/>
+            <text macro="editor" prefix=" " suffix=" red."/>
             <text variable="container-title"/>
             <text variable="collection-title"/>
-
-
-			
           </group>
           <text macro="publisher" prefix=". " suffix=""/>
           <text macro="year-date" prefix="; " suffix=""/>
           <text variable="page" prefix=", s. " suffix=""/>
-		  <text value="."/>
+          <text value="."/>
         </else-if>
         <else-if type="thesis">
           <group prefix=". ">
@@ -106,20 +99,20 @@
             <text variable="genre" prefix="[" suffix="]. "/>
             <text macro="publisher" suffix=""/>
             <text macro="year-date" prefix=", " suffix=""/>
-			<text value="."/>
+            <text value="."/>
           </group>
         </else-if>
-		<else-if type="webpage">
-			<text variable="URL" prefix=", "/>
-			<text value="."/>
-		</else-if>
+        <else-if type="webpage">
+          <text variable="URL" prefix=", "/>
+          <text value="."/>
+        </else-if>
         <else>
-          <text macro="title" prefix=". " suffix="" strip-periods="true" />
-          <text variable="container-title" form="short" strip-periods="true" prefix=". " suffix="" />
+          <text macro="title" prefix=". " suffix="" strip-periods="true"/>
+          <text variable="container-title" form="short" strip-periods="true" prefix=". " suffix=""/>
           <text macro="year-date" prefix=", " suffix=""/>
           <text variable="volume" prefix="; " suffix=""/>
-		  <text variable="issue" prefix="(" suffix=")"/>
-		  <text variable="page" prefix=": "/>
+          <text variable="issue" prefix="(" suffix=")"/>
+          <text variable="page" prefix=": "/>
           <text value="."/>
         </else>
       </choose>
diff --git a/optometry-and-vision-science.csl b/optometry-and-vision-science.csl
index cb18daf0c8..2aa9a6059c 100644
--- a/optometry-and-vision-science.csl
+++ b/optometry-and-vision-science.csl
@@ -16,7 +16,7 @@
     <updated>2012-09-14T21:18: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>
-   <macro name="editor">
+  <macro name="editor">
     <names variable="editor">
       <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", "/>
@@ -83,10 +83,10 @@
       <choose>
         <if type="bill book graphic legislation motion_picture report song" match="any">
           <group suffix="." prefix=" " delimiter=" ">
-	    <group delimiter=" ">
+            <group delimiter=" ">
               <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
               <text variable="volume" suffix="."/>
-	    </group>
+            </group>
             <text macro="edition"/>
             <text macro="editor" prefix="(" suffix=")"/>
           </group>
diff --git a/past-and-present.csl b/past-and-present.csl
index 0b3b4341d3..4752105316 100644
--- a/past-and-present.csl
+++ b/past-and-present.csl
@@ -182,7 +182,7 @@
                       <text macro="container"/>
                       <text macro="date"/>
                     </group>
-		    <text macro="archive"/>
+                    <text macro="archive"/>
                     <text macro="volref"/>
                     <text macro="pageref"/>
                   </group>
diff --git a/pediatric-physical-therapy.csl b/pediatric-physical-therapy.csl
index 4b38f4e0d8..51b32e9b01 100644
--- a/pediatric-physical-therapy.csl
+++ b/pediatric-physical-therapy.csl
@@ -9,10 +9,10 @@
     <author>
       <name>Sebastian Karcher</name>
     </author>
-    <issn>0898-5669</issn>
-    <eissn>1538-005X</eissn>
     <category citation-format="numeric"/>
     <category field="medicine"/>
+    <issn>0898-5669</issn>
+    <eissn>1538-005X</eissn>
     <summary>AMA without issue number and DOI</summary>
     <updated>2015-08-09T02:13:24+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>
@@ -44,25 +44,25 @@
     <choose>
       <if type="article-newspaper" match="none">
         <choose>
-	  <if variable="URL">
-	    <choose>
-	      <if variable="DOI">
-		<text variable="DOI" prefix="doi:"/>
-	      </if>
-	      <else>
-		<group delimiter=". ">
-		  <text variable="URL"/>
-		  <group>
+          <if variable="URL">
+            <choose>
+              <if variable="DOI">
+                <text variable="DOI" prefix="doi:"/>
+              </if>
+              <else>
+                <group delimiter=". ">
+                  <text variable="URL"/>
+                  <group>
                     <text term="accessed" text-case="capitalize-first" suffix=" "/>
                     <date variable="accessed">
                       <date-part name="month" suffix=" "/>
                       <date-part name="day" suffix=", "/>
                       <date-part name="year"/>
                     </date>
-		  </group>
-		</group>
-	      </else>
-	    </choose>
+                  </group>
+                </group>
+              </else>
+            </choose>
           </if>
         </choose>
       </if>
diff --git a/sage-harvard.csl b/sage-harvard.csl
index 4db371ddf3..7c3efc992a 100644
--- a/sage-harvard.csl
+++ b/sage-harvard.csl
@@ -123,10 +123,10 @@
   <macro name="pages">
     <choose>
       <if type="chapter paper-conference" match="any">
-	<group delimiter=" " prefix=", ">
-        <label variable="page" form="short" suffix=" "/>
-        <text variable="page"/>
-	</group>
+        <group delimiter=" " prefix=", ">
+          <label variable="page" form="short" suffix=" "/>
+          <text variable="page"/>
+        </group>
       </if>
       <else-if type="article-journal">
         <text variable="page" prefix=": "/>
@@ -190,7 +190,7 @@
           <text variable="genre"/>
           <text macro="publisher"/>
           <text macro="published-date"/>
-	</group>
+        </group>
         <text macro="locator"/>
       </group>
       <text macro="pages"/>
diff --git a/solutions.csl b/solutions.csl
index 48af8dadaa..ed76455835 100644
--- a/solutions.csl
+++ b/solutions.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" demote-non-dropping-particle="sort-only" default-locale="en-GB">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Solutions</title>
     <id>http://www.zotero.org/styles/solutions</id>
-    <link rel="self" href="http://www.zotero.org/styles/solutions"/>
-    <link rel="template" href="http://www.zotero.org/styles/nature"/>
+    <link href="http://www.zotero.org/styles/solutions" rel="self"/>
+    <link href="http://www.zotero.org/styles/nature" rel="template"/>
     <link href="http://www.thesolutionsjournal.com/node/457" rel="documentation"/>
     <author>
       <name>Jafet Andersson</name>
@@ -13,8 +13,8 @@
     </author>
     <category citation-format="numeric"/>
     <category field="science"/>
-    <eissn>2154-0926</eissn>
     <issn>2154-0896</issn>
+    <eissn>2154-0926</eissn>
     <updated>2015-12-08T11:16:17+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
diff --git a/structural-control-and-health-monitoring.csl b/structural-control-and-health-monitoring.csl
index fea0db30be..746863dafc 100644
--- a/structural-control-and-health-monitoring.csl
+++ b/structural-control-and-health-monitoring.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" page-range-format="expanded" initialize-with-hyphen="false" demote-non-dropping-particle="sort-only" default-locale="en-US">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Structural Control and Health Monitoring</title>
     <title-short>Struct. Control Health Monit.</title-short>
diff --git a/sunway-college-johor-bahru.csl b/sunway-college-johor-bahru.csl
index 44d6660ec2..263f3863e0 100644
--- a/sunway-college-johor-bahru.csl
+++ b/sunway-college-johor-bahru.csl
@@ -30,14 +30,13 @@ TO DO
   <info>
     <title>Sunway College Johor Bahru (Harvard)</title>
     <title-short>SYCJB</title-short>
-	<id>http://www.zotero.org/styles/sunway-college-johor-bahru</id>
-    <link href="http://www.zotero.org/styles/sunway-college-johor-bahru" rel="self"/> 
+    <id>http://www.zotero.org/styles/sunway-college-johor-bahru</id>
+    <link href="http://www.zotero.org/styles/sunway-college-johor-bahru" rel="self"/>
     <link href="http://www.sunway.edu.my/jb/images/library/Sunway%20JB%20Guide%20to%20Harvard%20Referencing_20150529.pdf" rel="documentation"/>
     <author>
       <name>Sunway College JB Library</name>
       <email>jblibrary@sunway.edu.my</email>
     </author>
-
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Sunway College Johor Bahru style based on the May 2015 version of the style guide titled Harvard referencing guide SCJB</summary>
@@ -152,12 +151,12 @@ TO DO
   </macro>
   <macro name="title">
     <choose>
-    <!-- encyclopedia type  newspaer-->
-	  <if type="entry-encyclopedia article-newspaper" match="any">
-	  	<!--example of result : ('Learning' 2015)-->
-		<text variable="title" quotes="true"/>
-	  </if>
-	<!-- chapter, conference paper, journal, magazine, newspaper, broadcast, interview, manuscript, map, personal communcation, speech, thesis, map, post, post-weblog -->
+      <!-- encyclopedia type  newspaer-->
+      <if type="entry-encyclopedia article-newspaper" match="any">
+        <!--example of result : ('Learning' 2015)-->
+        <text variable="title" quotes="true"/>
+      </if>
+      <!-- chapter, conference paper, journal, magazine, newspaper, broadcast, interview, manuscript, map, personal communcation, speech, thesis, map, post, post-weblog -->
       <else-if type="chapter paper-conference article-journal article-magazine broadcast interview manuscript map personal_communication speech thesis map post post-weblog" match="none">
         <!-- book, webpage, document, song -->
         <text variable="title" font-style="italic"/>
diff --git a/svensk-exegetisk-arsbok.csl b/svensk-exegetisk-arsbok.csl
index 941cec5652..e3623fb878 100644
--- a/svensk-exegetisk-arsbok.csl
+++ b/svensk-exegetisk-arsbok.csl
@@ -761,7 +761,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="10" et-al-use-first="9" subsequent-author-substitute="———" entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="10" et-al-use-first="9" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
     <sort>
       <key macro="contributors-sort"/>
       <key variable="title"/>
@@ -785,4 +785,3 @@
     </layout>
   </bibliography>
 </style>
-
diff --git a/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date-with-short-titles.csl b/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date-with-short-titles.csl
index b9bc2e99d0..76d1448f43 100644
--- a/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date-with-short-titles.csl
+++ b/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date-with-short-titles.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" version="1.0" demote-non-dropping-particle="sort-only" xmlns="http://purl.org/net/xbiblio/csl">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
   <info>
     <title>Technische Universität Dresden - Finanzwirtschaft und Finanzdienstleistungen (author-date, with short titles)</title>
     <title-short>TUD Betriebswirtschaftslehre (author-date, with short titles)</title-short>
diff --git a/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date.csl b/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date.csl
index 3c436812e7..fecb7ac3b2 100644
--- a/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date.csl
+++ b/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-author-date.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" version="1.0" demote-non-dropping-particle="sort-only" xmlns="http://purl.org/net/xbiblio/csl">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only">
   <info>
     <title>Technische Universität Dresden - Finanzwirtschaft und Finanzdienstleistungen (author-date)</title>
     <title-short>TUD Betriebswirtschaftslehre (author-date)</title-short>
diff --git a/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-note.csl b/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-note.csl
index f87da1d45a..9f481f3158 100644
--- a/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-note.csl
+++ b/technische-universitat-dresden-finanzwirtschaft-und-finanzdienstleistungen-note.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="note" version="1.0" demote-non-dropping-particle="sort-only" xmlns="http://purl.org/net/xbiblio/csl">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
   <info>
     <title>Technische Universität Dresden - Finanzwirtschaft und Finanzdienstleistungen (note)</title>
     <title-short>TUD Betriebswirtschaftslehre (note)</title-short>
diff --git a/the-american-naturalist.csl b/the-american-naturalist.csl
index 1436cfe4de..b17b3a4af4 100644
--- a/the-american-naturalist.csl
+++ b/the-american-naturalist.csl
@@ -31,10 +31,10 @@
       <if type="chapter paper-conference" match="any">
         <group delimiter=" ">
           <group delimiter=" ">
-            <label variable="page"  text-case="capitalize-first"/>
+            <label variable="page" text-case="capitalize-first"/>
             <text variable="page"/>
           </group>
-          <text term="in"   font-style="italic"/>
+          <text term="in" font-style="italic"/>
           <names variable="editor" delimiter=", " suffix=" ">
             <name and="text" initialize-with=". " delimiter=", "/>
             <label form="short" prefix=", "/>
@@ -236,7 +236,6 @@
             <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
             <number variable="volume" form="numeric"/>
           </group>
-
         </group>
       </else-if>
       <else-if type="legal_case">
diff --git a/the-astrophysical-journal.csl b/the-astrophysical-journal.csl
index b706f351cd..1f20f97b30 100644
--- a/the-astrophysical-journal.csl
+++ b/the-astrophysical-journal.csl
@@ -39,7 +39,7 @@
     </names>
   </macro>
   <macro name="issuance">
-    <date  variable="issued">
+    <date variable="issued">
       <date-part name="year"/>
     </date>
   </macro>
@@ -80,7 +80,7 @@
       <if is-numeric="edition">
         <group delimiter=" ">
           <number variable="edition" form="ordinal"/>
-          <text term ="edition" form="short"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
diff --git a/the-chemical-society-of-japan.csl b/the-chemical-society-of-japan.csl
index 98073aa4ab..d613f41e02 100644
--- a/the-chemical-society-of-japan.csl
+++ b/the-chemical-society-of-japan.csl
@@ -11,7 +11,7 @@
       <uri>http://www.mendeley.com/profiles/shoji-takahashi3/</uri>
     </author>
     <category citation-format="numeric"/>
-	<category field="chemistry"/>
+    <category field="chemistry"/>
     <updated>2015-12-04T01:42:50+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/universite-de-sherbrooke-departement-de-geomatique.csl b/universite-de-sherbrooke-departement-de-geomatique.csl
index 5858bd3c78..6e2015b0be 100644
--- a/universite-de-sherbrooke-departement-de-geomatique.csl
+++ b/universite-de-sherbrooke-departement-de-geomatique.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="never" default-locale="fr-CA">
   <info>
     <title>Université de Sherbrooke - Département de géomatique (French - Canada)</title>
diff --git a/university-college-lillebaelt-apa.csl b/university-college-lillebaelt-apa.csl
index b5cabd6a8e..41cf982a40 100644
--- a/university-college-lillebaelt-apa.csl
+++ b/university-college-lillebaelt-apa.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="never" and="symbol" initialize-with=". " delimiter-precedes-last="never" default-locale="da-DK">
   <info>
     <title>University College Lillebælt - APA (Danish)</title>
@@ -100,20 +100,20 @@
       </if>
       <else-if type="legislation">
         <choose>
-        <if variable="author">
-          <names variable="author"/>
-          <text variable="volume" prefix=", "/>
-        </if>
-        <else-if type="legislation" position="first">
-          <text variable="title"/>
-          <group prefix=", " delimiter=": ">
-            <text value="herefter kaldet"/>
-            <text variable="title-short"/>
-          </group>
-        </else-if>
-        <else-if type="legislation" position="subsequent">
-          <text variable="title" form="short" font-style="italic"/>
-        </else-if>
+          <if variable="author">
+            <names variable="author"/>
+            <text variable="volume" prefix=", "/>
+          </if>
+          <else-if type="legislation" position="first">
+            <text variable="title"/>
+            <group prefix=", " delimiter=": ">
+              <text value="herefter kaldet"/>
+              <text variable="title-short"/>
+            </group>
+          </else-if>
+          <else-if type="legislation" position="subsequent">
+            <text variable="title" form="short" font-style="italic"/>
+          </else-if>
         </choose>
       </else-if>
       <else>
diff --git a/university-of-new-england-australia-note.csl b/university-of-new-england-australia-note.csl
index ba7240ed7d..4fdbf70980 100644
--- a/university-of-new-england-australia-note.csl
+++ b/university-of-new-england-australia-note.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB" xmlns="http://purl.org/net/xbiblio/csl">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>University of New England, Australia (note)</title>
     <id>http://www.zotero.org/styles/university-of-new-england-australia-note</id>
@@ -544,7 +544,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
     <sort>
       <key macro="contributors-sort"/>
       <key variable="title"/>
diff --git a/uppsala-universitet-institutionen-for-biologisk-grundutbildning.csl b/uppsala-universitet-institutionen-for-biologisk-grundutbildning.csl
index e96e904403..aa3831c7e5 100644
--- a/uppsala-universitet-institutionen-for-biologisk-grundutbildning.csl
+++ b/uppsala-universitet-institutionen-for-biologisk-grundutbildning.csl
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" version="1.0" demote-non-dropping-particle="never" xmlns="http://purl.org/net/xbiblio/csl">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never">
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Uppsala universitet, Institutionen för biologisk grundutbildning</title>
     <title-short>IBG Uppsala</title-short>
@@ -17,29 +17,26 @@
     <updated>2015-10-22T09: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>
     <terms>
       <term name="et-al">et al.</term>
     </terms>
   </locale>
-
   <locale xml:lang="en-GB">
     <date form="text">
-      <date-part name="day" suffix=" " />
-      <date-part name="month" suffix=" " />
-      <date-part name="year" />
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
     </date>
     <terms>
       <term name="online">WWW document</term>
     </terms>
   </locale>
-
   <locale xml:lang="sv-SE">
     <date form="text">
-      <date-part name="year" suffix="-" />
-      <date-part name="month" form="numeric-leading-zeros" suffix="-" />
-      <date-part name="day" form="numeric-leading-zeros" />
+      <date-part name="year" suffix="-"/>
+      <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+      <date-part name="day" form="numeric-leading-zeros"/>
     </date>
     <terms>
       <term name="online">WWW-dokument</term>
@@ -55,7 +52,6 @@
       </term>
     </terms>
   </locale>
-
   <macro name="author-short">
     <names variable="author">
       <name form="short" and="symbol"/>
@@ -189,7 +185,7 @@
         <else-if type="webpage post-weblog" match="any">
           <group suffix=".">
             <group>
-              <text term="online" />
+              <text term="online"/>
               <date form="text" variable="issued" prefix=" "/>
               <text variable="URL" prefix=": " suffix=". "/>
             </group>
diff --git a/vancouver-brackets-no-et-al.csl b/vancouver-brackets-no-et-al.csl
index 18fe678426..7779f929c9 100644
--- a/vancouver-brackets-no-et-al.csl
+++ b/vancouver-brackets-no-et-al.csl
@@ -257,7 +257,7 @@
       <if type="article-journal article-magazine article-newspaper review review-book" match="any">
         <text variable="page" prefix=":"/>
       </if>
-     <else-if type="book" match="any">
+      <else-if type="book" match="any">
         <text variable="number-of-pages" prefix=" "/>
         <choose>
           <if is-numeric="number-of-pages">
diff --git a/zeitschrift-fur-religionswissenschaft-author-date.csl b/zeitschrift-fur-religionswissenschaft-author-date.csl
index 7f60a97a58..3afeddd847 100644
--- a/zeitschrift-fur-religionswissenschaft-author-date.csl
+++ b/zeitschrift-fur-religionswissenschaft-author-date.csl
@@ -1,13 +1,13 @@
 <?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="chicago">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Zeitschrift für Religionswissenschaft (author-date)</title>
     <title-short>ZfR (author-date)</title-short>
     <id>http://www.zotero.org/styles/zeitschrift-fur-religionswissenschaft-author-date</id>
     <link href="http://www.zotero.org/styles/zeitschrift-fur-religionswissenschaft-author-date" rel="self"/>
-    <link href="http://www.degruyter.com/view/supplement/s2194508X_Manuskriptrichtlinien_de.pdf" rel="documentation" xml:lang="de"/>
     <link href="https://www.zotero.org/styles/american-sociological-association" rel="template"/>
+    <link href="http://www.degruyter.com/view/supplement/s2194508X_Manuskriptrichtlinien_de.pdf" xml:lang="de" rel="documentation"/>
     <author>
       <name>Frederik Elwert</name>
       <email>frederik.elwert@rub.de</email>
diff --git a/zeitschrift-fur-religionswissenschaft-note.csl b/zeitschrift-fur-religionswissenschaft-note.csl
index 240a0e50da..1ac0e8138e 100644
--- a/zeitschrift-fur-religionswissenschaft-note.csl
+++ b/zeitschrift-fur-religionswissenschaft-note.csl
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="never" page-range-format="chicago">
-<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
+  <!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>Zeitschrift für Religionswissenschaft (note)</title>
     <title-short>ZfR (note)</title-short>
     <id>http://www.zotero.org/styles/zeitschrift-fur-religionswissenschaft-note</id>
     <link href="http://www.zotero.org/styles/zeitschrift-fur-religionswissenschaft-note" rel="self"/>
-    <link href="http://www.degruyter.com/view/supplement/s2194508X_Manuskriptrichtlinien_de.pdf" rel="documentation" xml:lang="de"/>
     <link href="https://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
+    <link href="http://www.degruyter.com/view/supplement/s2194508X_Manuskriptrichtlinien_de.pdf" xml:lang="de" rel="documentation"/>
     <author>
       <name>Frederik Elwert</name>
       <email>frederik.elwert@rub.de</email>
@@ -1184,7 +1184,7 @@
       </choose>
     </layout>
   </citation>
-  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
     <sort>
       <key macro="contributors-sort"/>
       <key variable="title"/>