From 3098343404fcc2750ddae73d10111ba7eecba605 Mon Sep 17 00:00:00 2001
From: rmzelle <rintze.zelle@gmail.com>
Date: Thu, 9 Feb 2017 23:08:40 -0500
Subject: [PATCH] Reindent/reorder

---
 arctic-antarctic-and-alpine-research.csl      |   4 +-
 comparative-population-studies.csl            |   2 +-
 edward-elgar-business-and-social-sciences.csl | 652 +++++++++---------
 elsevier-vancouver-author-date.csl            |   6 +-
 fachhochschule-vorarlberg-note.csl            |   2 +-
 harvard-university-of-technology-sydney.csl   |   2 +-
 ...sanitation-and-hygiene-for-development.csl | 324 ++++-----
 mind-and-language.csl                         |   2 +-
 radiochimica-acta.csl                         |   2 +-
 world-applied-sciences-journal.csl            |   4 +-
 zwitscher-maschine.csl                        |  16 +-
 11 files changed, 508 insertions(+), 508 deletions(-)

diff --git a/arctic-antarctic-and-alpine-research.csl b/arctic-antarctic-and-alpine-research.csl
index cc3bad0145..0b613d91a0 100644
--- a/arctic-antarctic-and-alpine-research.csl
+++ b/arctic-antarctic-and-alpine-research.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" version="1.0" 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="in-text" version="1.0" demote-non-dropping-particle="never" default-locale="en-GB">
   <info>
     <title>Arctic, Antarctic, and Alpine Research</title>
     <title-short>AAAR</title-short>
@@ -421,7 +421,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/comparative-population-studies.csl b/comparative-population-studies.csl
index f754d37aa8..57d9fbe3cf 100644
--- a/comparative-population-studies.csl
+++ b/comparative-population-studies.csl
@@ -4,8 +4,8 @@
     <title>Comparative Population Studies</title>
     <id>http://www.zotero.org/styles/comparative-population-studies</id>
     <link href="http://www.zotero.org/styles/comparative-population-studies" rel="self"/>
-    <link href="http://www.comparativepopulationstudies.de/index.php/CPoS/pages/view/AGL_E" rel="documentation"/>
     <link href="http://www.zotero.org/styles/wirtschaftsuniversitat-wien-handel-und-marketing" rel="template"/>
+    <link href="http://www.comparativepopulationstudies.de/index.php/CPoS/pages/view/AGL_E" rel="documentation"/>
     <author>
       <name>Brenton M. Wiernik</name>
       <email>zotero@wiernik.org</email>
diff --git a/edward-elgar-business-and-social-sciences.csl b/edward-elgar-business-and-social-sciences.csl
index bab4ec7265..d58fbaba79 100644
--- a/edward-elgar-business-and-social-sciences.csl
+++ b/edward-elgar-business-and-social-sciences.csl
@@ -1,326 +1,326 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="never" default-locale="en-GB">
-  <info>
-    <title>Edward Elgar Publishing - Business and Social Sciences</title>
-    <id>http://www.zotero.org/styles/edward-elgar-business-and-social-sciences</id>
-    <link href="http://www.zotero.org/styles/edward-elgar-business-and-social-sciences" rel="self"/>
-    <link href="http://www.zotero.org/styles/british-journal-of-industrial-relations" rel="template"/>
-    <link href="https://www.e-elgar.com/sites/e-elgar/files/images/shared/authoredguidebussocsci20151.pdf" rel="documentation"/>
-    <author>
-      <name>Patrick O'Brien, PhD</name>
-      <email>obrienpat86@gmail.com</email>
-    </author>
-    <author>
-      <name>Brenton M. Wiernik</name>
-      <email>zotero@wiernik.org</email>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="social_science"/>
-    <summary>Style for Edward Elgar Publishing Business and Social Sciences (non-textbook) publications.</summary>
-    <updated>2017-02-03T13:40:05+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>
-  <!-- Note: Patents and legal citations not currently supported -->
-  <macro name="conditionalusetitle">
-    <choose>
-      <if type="article-newspaper article-magazine">
-        <text variable="container-title"/>
-      </if>
-      <else>
-        <text variable="title" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="year">
-    <choose>
-      <if variable="original-date">
-        <date variable="original-date">
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else>
-        <text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="author-year">
-    <names variable="author">
-      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="first"/>
-      <label form="short" prefix=" (" suffix=")"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="conditionalusetitle" font-style="italic"/>
-      </substitute>
-    </names>
-    <text macro="year" prefix=" (" suffix=")"/>
-  </macro>
-  <macro name="author-sort">
-    <names variable="author">
-      <name form="short" and="text" delimiter-precedes-last="never" initialize-with=". "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <text macro="conditionalusetitle"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-year-short">
-    <group delimiter=" ">
-      <text macro="author-sort"/>
-      <choose>
-        <if variable="issued original-date" match="none">
-          <text macro="year" prefix=", "/>
-        </if>
-        <else-if variable="original-date">
-          <date variable="original-date">
-            <date-part name="year"/>
-          </date>
-          <date variable="issued" prefix=" [" suffix="]">
-            <date-part name="year"/>
-          </date>
-        </else-if>
-        <else>
-          <text macro="year"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if variable="author editor translator" match="any">
-        <choose>
-          <if variable="container-title" match="none">
-            <text variable="title" font-style="italic" text-case="title"/>
-          </if>
-          <else>
-            <text variable="title" quotes="true"/>
-          </else>
-        </choose>
-      </if>
-      <else-if type="article-newspaper article-magazine" match="any">
-        <text variable="title" quotes="true"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="container">
-    <choose>
-      <if type="article-journal" match="any">
-        <group delimiter=", ">
-          <group delimiter=" ">
-            <text variable="container-title" font-style="italic" text-case="title"/>
-            <choose>
-              <if variable="original-date">
-                <date variable="issued" prefix="(" suffix=")">
-                  <date-part name="year"/>
-                </date>
-              </if>
-            </choose>
-          </group>
-          <group delimiter=" ">
-            <text variable="volume" font-weight="bold"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <text variable="page"/>
-        </group>
-      </if>
-      <else-if type="article-newspaper article-magazine" match="any">
-        <group delimiter=", ">
-          <group delimiter=" ">
-            <choose>
-              <if variable="author editor translator" match="any">
-                <text variable="container-title" font-style="italic" text-case="title"/>
-              </if>
-            </choose>
-            <choose>
-              <if variable="original-date">
-                <date variable="issued" prefix="(" suffix=")">
-                  <date-part name="year"/>
-                </date>
-              </if>
-            </choose>
-          </group>
-          <group delimiter=" ">
-            <text variable="volume" font-weight="bold"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <text variable="page"/>
-        </group>
-      </else-if>
-      <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia book report thesis graphic song personal_communication manuscript motion_picture interview map post-weblog post broadcast webpage speech" match="any">
-        <group delimiter=", ">
-          <choose>
-            <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-              <choose>
-                <if variable="editor translator" match="any">
-                  <group delimiter=", ">
-                    <group delimiter=" ">
-                      <text term="in"/>
-                      <names variable="editor" delimiter=", ">
-                        <name and="text" initialize-with=". "/>
-                        <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
-                        <substitute>
-                          <names variable="translator"/>
-                        </substitute>
-                      </names>
-                      <choose>
-                        <if variable="original-date">
-                          <date variable="issued" prefix="(" suffix=")">
-                            <date-part name="year"/>
-                          </date>
-                        </if>
-                      </choose>
-                    </group>
-                    <text variable="container-title" font-style="italic" text-case="title"/>
-                  </group>
-                </if>
-                <else>
-                  <group delimiter=" ">
-                    <text term="in"/>
-                    <text variable="container-title" font-style="italic" text-case="title"/>
-                    <choose>
-                      <if variable="original-date">
-                        <date variable="issued" prefix="(" suffix=")">
-                          <date-part name="year"/>
-                        </date>
-                      </if>
-                    </choose>
-                  </group>
-                </else>
-              </choose>
-            </if>
-            <else>
-              <choose>
-                <if variable="original-date">
-                  <date variable="issued" prefix="(" suffix=")">
-                    <date-part name="year"/>
-                  </date>
-                </if>
-              </choose>
-            </else>
-          </choose>
-          <choose>
-            <if is-numeric="edition">
-              <group delimiter=" ">
-                <number variable="edition" form="ordinal"/>
-                <text term="edition" form="short"/>
-              </group>
-            </if>
-            <else>
-              <text variable="edition"/>
-            </else>
-          </choose>
-          <group delimiter=" ">
-            <text term="volume" form="short"/>
-            <text variable="volume"/>
-          </group>
-          <group delimiter=" ">
-            <text variable="medium"/>
-          </group>
-          <group delimiter=" ">
-            <choose>
-              <if variable="event">
-                <choose>
-                  <if type="paper-conference" match="none">
-                    <group delimiter=" ">
-                      <text variable="genre"/>
-                      <text term="presented at"/>
-                      <text variable="event"/>
-                    </group>
-                  </if>
-                </choose>
-              </if>
-              <else>
-                <text variable="genre"/>
-                <choose>
-                  <if variable="number">
-                    <text term="number" form="short" suffix=" "/>
-                    <text variable="number"/>
-                  </if>
-                </choose>
-              </else>
-            </choose>
-          </group>
-          <group delimiter=": ">
-            <text variable="publisher-place"/>
-            <text variable="publisher"/>
-          </group>
-          <group delimiter=" ">
-            <label variable="page" form="short" suffix=" "/>
-            <text variable="page"/>
-          </group>
-        </group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="article-newspaper article-magazine motion_picture speech broadcast report" match="any">
-        <date variable="issued" delimiter=" ">
-          <date-part name="day"/>
-          <date-part name="month"/>
-        </date>
-      </if>
-    </choose>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="page" type="book" match="none">
-        <choose>
-          <if variable="DOI">
-            <group delimiter=" ">
-              <text term="accessed"/>
-              <text term="at"/>
-              <text variable="DOI" prefix="https://doi.org/"/>
-            </group>
-          </if>
-          <else-if variable="URL">
-            <group delimiter=" ">
-              <text term="accessed" suffix=" "/>
-              <date variable="accessed">
-                <date-part name="day" suffix=" "/>
-                <date-part name="month" suffix=" "/>
-                <date-part name="year"/>
-              </date>
-              <text term="at"/>
-              <text variable="URL"/>
-            </group>
-          </else-if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true" collapse="year">
-    <sort>
-      <key macro="author-sort"/>
-      <key macro="year"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=": ">
-        <text macro="author-year-short"/>
-        <text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography hanging-indent="true" entry-spacing="1">
-    <sort>
-      <key macro="author-sort"/>
-      <key macro="year"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=", ">
-        <text macro="author-year"/>
-        <text macro="title"/>
-        <text macro="container"/>
-        <text macro="issued"/>
-        <text macro="access"/>
-      </group>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" page-range-format="minimal" demote-non-dropping-particle="never" default-locale="en-GB">
+  <info>
+    <title>Edward Elgar Publishing - Business and Social Sciences</title>
+    <id>http://www.zotero.org/styles/edward-elgar-business-and-social-sciences</id>
+    <link href="http://www.zotero.org/styles/edward-elgar-business-and-social-sciences" rel="self"/>
+    <link href="http://www.zotero.org/styles/british-journal-of-industrial-relations" rel="template"/>
+    <link href="https://www.e-elgar.com/sites/e-elgar/files/images/shared/authoredguidebussocsci20151.pdf" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien, PhD</name>
+      <email>obrienpat86@gmail.com</email>
+    </author>
+    <author>
+      <name>Brenton M. Wiernik</name>
+      <email>zotero@wiernik.org</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="social_science"/>
+    <summary>Style for Edward Elgar Publishing Business and Social Sciences (non-textbook) publications.</summary>
+    <updated>2017-02-03T13:40:05+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>
+  <!-- Note: Patents and legal citations not currently supported -->
+  <macro name="conditionalusetitle">
+    <choose>
+      <if type="article-newspaper article-magazine">
+        <text variable="container-title"/>
+      </if>
+      <else>
+        <text variable="title" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year">
+    <choose>
+      <if variable="original-date">
+        <date variable="original-date">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-year">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="first"/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="conditionalusetitle" font-style="italic"/>
+      </substitute>
+    </names>
+    <text macro="year" prefix=" (" suffix=")"/>
+  </macro>
+  <macro name="author-sort">
+    <names variable="author">
+      <name form="short" and="text" delimiter-precedes-last="never" initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="conditionalusetitle"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-year-short">
+    <group delimiter=" ">
+      <text macro="author-sort"/>
+      <choose>
+        <if variable="issued original-date" match="none">
+          <text macro="year" prefix=", "/>
+        </if>
+        <else-if variable="original-date">
+          <date variable="original-date">
+            <date-part name="year"/>
+          </date>
+          <date variable="issued" prefix=" [" suffix="]">
+            <date-part name="year"/>
+          </date>
+        </else-if>
+        <else>
+          <text macro="year"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="author editor translator" match="any">
+        <choose>
+          <if variable="container-title" match="none">
+            <text variable="title" font-style="italic" text-case="title"/>
+          </if>
+          <else>
+            <text variable="title" quotes="true"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text variable="title" quotes="true"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="container">
+    <choose>
+      <if type="article-journal" match="any">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic" text-case="title"/>
+            <choose>
+              <if variable="original-date">
+                <date variable="issued" prefix="(" suffix=")">
+                  <date-part name="year"/>
+                </date>
+              </if>
+            </choose>
+          </group>
+          <group delimiter=" ">
+            <text variable="volume" font-weight="bold"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text variable="container-title" font-style="italic" text-case="title"/>
+              </if>
+            </choose>
+            <choose>
+              <if variable="original-date">
+                <date variable="issued" prefix="(" suffix=")">
+                  <date-part name="year"/>
+                </date>
+              </if>
+            </choose>
+          </group>
+          <group delimiter=" ">
+            <text variable="volume" font-weight="bold"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia book report thesis graphic song personal_communication manuscript motion_picture interview map post-weblog post broadcast webpage speech" match="any">
+        <group delimiter=", ">
+          <choose>
+            <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+              <choose>
+                <if variable="editor translator" match="any">
+                  <group delimiter=", ">
+                    <group delimiter=" ">
+                      <text term="in"/>
+                      <names variable="editor" delimiter=", ">
+                        <name and="text" initialize-with=". "/>
+                        <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+                        <substitute>
+                          <names variable="translator"/>
+                        </substitute>
+                      </names>
+                      <choose>
+                        <if variable="original-date">
+                          <date variable="issued" prefix="(" suffix=")">
+                            <date-part name="year"/>
+                          </date>
+                        </if>
+                      </choose>
+                    </group>
+                    <text variable="container-title" font-style="italic" text-case="title"/>
+                  </group>
+                </if>
+                <else>
+                  <group delimiter=" ">
+                    <text term="in"/>
+                    <text variable="container-title" font-style="italic" text-case="title"/>
+                    <choose>
+                      <if variable="original-date">
+                        <date variable="issued" prefix="(" suffix=")">
+                          <date-part name="year"/>
+                        </date>
+                      </if>
+                    </choose>
+                  </group>
+                </else>
+              </choose>
+            </if>
+            <else>
+              <choose>
+                <if variable="original-date">
+                  <date variable="issued" prefix="(" suffix=")">
+                    <date-part name="year"/>
+                  </date>
+                </if>
+              </choose>
+            </else>
+          </choose>
+          <choose>
+            <if is-numeric="edition">
+              <group delimiter=" ">
+                <number variable="edition" form="ordinal"/>
+                <text term="edition" form="short"/>
+              </group>
+            </if>
+            <else>
+              <text variable="edition"/>
+            </else>
+          </choose>
+          <group delimiter=" ">
+            <text term="volume" form="short"/>
+            <text variable="volume"/>
+          </group>
+          <group delimiter=" ">
+            <text variable="medium"/>
+          </group>
+          <group delimiter=" ">
+            <choose>
+              <if variable="event">
+                <choose>
+                  <if type="paper-conference" match="none">
+                    <group delimiter=" ">
+                      <text variable="genre"/>
+                      <text term="presented at"/>
+                      <text variable="event"/>
+                    </group>
+                  </if>
+                </choose>
+              </if>
+              <else>
+                <text variable="genre"/>
+                <choose>
+                  <if variable="number">
+                    <text term="number" form="short" suffix=" "/>
+                    <text variable="number"/>
+                  </if>
+                </choose>
+              </else>
+            </choose>
+          </group>
+          <group delimiter=": ">
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="article-newspaper article-magazine motion_picture speech broadcast report" match="any">
+        <date variable="issued" delimiter=" ">
+          <date-part name="day"/>
+          <date-part name="month"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="page" type="book" match="none">
+        <choose>
+          <if variable="DOI">
+            <group delimiter=" ">
+              <text term="accessed"/>
+              <text term="at"/>
+              <text variable="DOI" prefix="https://doi.org/"/>
+            </group>
+          </if>
+          <else-if variable="URL">
+            <group delimiter=" ">
+              <text term="accessed" suffix=" "/>
+              <date variable="accessed">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" suffix=" "/>
+                <date-part name="year"/>
+              </date>
+              <text term="at"/>
+              <text variable="URL"/>
+            </group>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true" collapse="year">
+    <sort>
+      <key macro="author-sort"/>
+      <key macro="year"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=": ">
+        <text macro="author-year-short"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" entry-spacing="1">
+    <sort>
+      <key macro="author-sort"/>
+      <key macro="year"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", ">
+        <text macro="author-year"/>
+        <text macro="title"/>
+        <text macro="container"/>
+        <text macro="issued"/>
+        <text macro="access"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/elsevier-vancouver-author-date.csl b/elsevier-vancouver-author-date.csl
index fe095b1c23..969f542456 100644
--- a/elsevier-vancouver-author-date.csl
+++ b/elsevier-vancouver-author-date.csl
@@ -22,17 +22,17 @@
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-	<text variable="title"/>
+        <text variable="title"/>
       </substitute>
     </names>
   </macro>
-    <macro name="author-short">
+  <macro name="author-short">
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with=". "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
-	<text variable="title" form="short"/>
+        <text variable="title" form="short"/>
       </substitute>
     </names>
   </macro>
diff --git a/fachhochschule-vorarlberg-note.csl b/fachhochschule-vorarlberg-note.csl
index cebea1c463..7f4bdcec21 100644
--- a/fachhochschule-vorarlberg-note.csl
+++ b/fachhochschule-vorarlberg-note.csl
@@ -179,7 +179,7 @@
           <text variable="publisher"/>
         </group>
         <choose>
-          <if variable="page"></if>
+          <if variable="page"/>
           <else>
             <text value=".&#160;"/>
           </else>
diff --git a/harvard-university-of-technology-sydney.csl b/harvard-university-of-technology-sydney.csl
index 28bdc9b881..cfb78c0a84 100644
--- a/harvard-university-of-technology-sydney.csl
+++ b/harvard-university-of-technology-sydney.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" xmlns="http://purl.org/net/xbiblio/csl" demote-non-dropping-particle="sort-only" version="1.0" page-range-format="minimal" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" demote-non-dropping-particle="sort-only" version="1.0" page-range-format="minimal" default-locale="en-GB">
   <info>
     <title>Harvard - University of Technology Sydney</title>
     <title-short>Harvard UTS</title-short>
diff --git a/journal-of-water-sanitation-and-hygiene-for-development.csl b/journal-of-water-sanitation-and-hygiene-for-development.csl
index bfc831b58e..1a2a126d24 100644
--- a/journal-of-water-sanitation-and-hygiene-for-development.csl
+++ b/journal-of-water-sanitation-and-hygiene-for-development.csl
@@ -1,18 +1,18 @@
-<?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" default-locale="en-GB" demote-non-dropping-particle="never">
   <info>
     <title>Journal of Water Sanitation and Hygiene for Development</title>
     <title-short>JWaSHDev</title-short>
     <id>http://www.zotero.org/styles/journal-of-water-sanitation-and-hygiene-for-development</id>
-    <link href="http://www.zotero.org/styles/journal-of-water-sanitation-and-hygiene-for-development" rel="self" />
-    <link href="http://www.zotero.org/styles/apa" rel="template" />
-    <link href="http://washdev.iwaponline.com/content/instructions-authors" rel="documentation" />
+    <link href="http://www.zotero.org/styles/journal-of-water-sanitation-and-hygiene-for-development" rel="self"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <link href="http://washdev.iwaponline.com/content/instructions-authors" rel="documentation"/>
     <author>
       <name>Patrick O'Brien, PhD</name>
       <email>obrienpat86@gmail.com</email>
     </author>
-    <category citation-format="author-date" />
-    <category field="science" />
+    <category citation-format="author-date"/>
+    <category field="science"/>
     <issn>2043-9083</issn>
     <eissn>2408-9362</eissn>
     <updated>2017-01-08T20:42:31+00:00</updated>
@@ -35,12 +35,12 @@
       <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=", ">
           <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", " />
-            <label form="short" prefix=" (" text-case="title" suffix=")" />
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=" (" text-case="title" suffix=")"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", " />
-            <label form="short" prefix=" (" suffix=")" />
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=" (" suffix=")"/>
           </names>
         </group>
       </if>
@@ -51,12 +51,12 @@
       <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
         <group delimiter=", " prefix=" (" suffix=")">
           <names variable="container-author" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", " />
-            <label form="short" prefix=", " text-case="title" />
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
           </names>
           <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". " delimiter=", " />
-            <label form="short" prefix=", " text-case="title" />
+            <name and="symbol" initialize-with=". " delimiter=", "/>
+            <label form="short" prefix=", " text-case="title"/>
           </names>
         </group>
       </if>
@@ -64,18 +64,18 @@
   </macro>
   <macro name="author">
     <names variable="author">
-      <name delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all" sort-separator=" " />
-      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first" />
+      <name delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" (" suffix=")" text-case="capitalize-first"/>
       <substitute>
-        <names variable="editor" />
-        <names variable="translator" />
+        <names variable="editor"/>
+        <names variable="translator"/>
         <choose>
           <if type="report">
-            <text variable="publisher" />
-            <text macro="title" />
+            <text variable="publisher"/>
+            <text macro="title"/>
           </if>
           <else>
-            <text macro="title" />
+            <text macro="title"/>
           </else>
         </choose>
       </substitute>
@@ -83,34 +83,34 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" font-style="normal" and="symbol" initialize-with=". " />
-      <et-al font-style="italic" />
+      <name form="short" font-style="normal" and="symbol" initialize-with=". "/>
+      <et-al font-style="italic"/>
       <substitute>
-        <names variable="editor" />
-        <names variable="translator" />
+        <names variable="editor"/>
+        <names variable="translator"/>
         <choose>
           <if type="report">
-            <text variable="publisher" />
-            <text variable="title" form="short" font-style="italic" />
+            <text variable="publisher"/>
+            <text variable="title" form="short" font-style="italic"/>
           </if>
           <else-if type="legal_case">
-            <text variable="title" font-style="italic" />
+            <text variable="title" font-style="italic"/>
           </else-if>
           <else-if type="bill book graphic legislation motion_picture song" match="any">
-            <text variable="title" form="short" font-style="italic" />
+            <text variable="title" form="short" font-style="italic"/>
           </else-if>
           <else-if variable="reviewed-author">
             <choose>
               <if variable="reviewed-title" match="none">
-                <text variable="title" form="short" font-style="italic" prefix="Review of " />
+                <text variable="title" form="short" font-style="italic" prefix="Review of "/>
               </if>
               <else>
-                <text variable="title" form="short" quotes="true" />
+                <text variable="title" form="short" quotes="true"/>
               </else>
             </choose>
           </else-if>
           <else>
-            <text variable="title" form="short" quotes="true" />
+            <text variable="title" form="short" quotes="true"/>
           </else>
         </choose>
       </substitute>
@@ -122,17 +122,17 @@
         <choose>
           <if variable="archive" match="any">
             <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" " />
-              <text term="from" suffix=" " />
-              <text variable="archive" suffix="." />
-              <text variable="archive_location" prefix=" (" suffix=")" />
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
             </group>
           </if>
           <else>
             <group>
-              <text term="retrieved" text-case="capitalize-first" suffix=" " />
-              <text term="from" suffix=" " />
-              <text variable="URL" />
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="URL"/>
             </group>
           </else>
         </choose>
@@ -140,24 +140,24 @@
       <else>
         <choose>
           <if variable="DOI">
-            <text variable="DOI" prefix="https://doi.org/" />
+            <text variable="DOI" prefix="https://doi.org/"/>
           </if>
           <else>
             <choose>
               <if type="webpage">
                 <group delimiter=" ">
-                  <text variable="URL" />
+                  <text variable="URL"/>
                   <group prefix="(" suffix=")">
-                    <text term="accessed" suffix=" " />
-                    <date form="text" variable="accessed" />
+                    <text term="accessed" suffix=" "/>
+                    <date form="text" variable="accessed"/>
                   </group>
                 </group>
               </if>
               <else>
                 <group>
-                  <text term="retrieved" text-case="capitalize-first" suffix=" " />
-                  <text term="from" suffix=" " />
-                  <text variable="URL" />
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <text term="from" suffix=" "/>
+                  <text variable="URL"/>
                 </group>
               </else>
             </choose>
@@ -171,10 +171,10 @@
       <if type="book graphic manuscript motion_picture report song speech thesis" match="any">
         <choose>
           <if variable="version" type="book" match="all">
-            <text variable="title" />
+            <text variable="title"/>
           </if>
           <else>
-            <text variable="title" font-style="italic" />
+            <text variable="title" font-style="italic"/>
           </else>
         </choose>
       </if>
@@ -182,74 +182,74 @@
         <choose>
           <if variable="reviewed-title">
             <group delimiter=" ">
-              <text variable="title" />
+              <text variable="title"/>
               <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="italic" prefix="Review of " />
+                <text variable="reviewed-title" font-style="italic" prefix="Review of "/>
                 <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" " />
-                  <name and="symbol" initialize-with=". " delimiter=", " />
+                  <label form="verb-short" suffix=" "/>
+                  <name and="symbol" initialize-with=". " delimiter=", "/>
                 </names>
               </group>
             </group>
           </if>
           <else>
             <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="italic" prefix="Review of " />
+              <text variable="title" font-style="italic" prefix="Review of "/>
               <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" " />
-                <name and="symbol" initialize-with=". " delimiter=", " />
+                <label form="verb-short" suffix=" "/>
+                <name and="symbol" initialize-with=". " delimiter=", "/>
               </names>
             </group>
           </else>
         </choose>
       </else-if>
       <else>
-        <text variable="title" suffix="." />
+        <text variable="title" suffix="."/>
       </else>
     </choose>
   </macro>
   <macro name="title-plus-extra">
-    <text macro="title" />
+    <text macro="title"/>
     <choose>
       <if type="report thesis" match="any">
         <group prefix=" (" suffix=")" delimiter=", ">
           <group delimiter=" ">
             <choose>
               <if variable="genre" match="any">
-                <text variable="genre" />
+                <text variable="genre"/>
               </if>
               <else>
-                <text variable="collection-title" />
+                <text variable="collection-title"/>
               </else>
             </choose>
-            <text variable="number" prefix="No. " />
+            <text variable="number" prefix="No. "/>
           </group>
           <group delimiter=" ">
-            <text term="version" text-case="capitalize-first" />
-            <text variable="version" />
+            <text term="version" text-case="capitalize-first"/>
+            <text variable="version"/>
           </group>
-          <text macro="edition" />
+          <text macro="edition"/>
         </group>
       </if>
       <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]" />
+        <text variable="genre" prefix=" [" suffix="]"/>
       </else-if>
       <else-if variable="version">
         <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first" />
-          <text variable="version" />
+          <text term="version" text-case="capitalize-first"/>
+          <text variable="version"/>
         </group>
       </else-if>
     </choose>
-    <text macro="format" prefix=" [" suffix="]" />
+    <text macro="format" prefix=" [" suffix="]"/>
   </macro>
   <macro name="format">
     <choose>
       <if match="any" variable="medium">
-        <text variable="medium" text-case="capitalize-first" />
+        <text variable="medium" text-case="capitalize-first"/>
       </if>
       <else-if type="dataset" match="any">
-        <text value="Data set" />
+        <text value="Data set"/>
       </else-if>
     </choose>
   </macro>
@@ -257,35 +257,35 @@
     <choose>
       <if type="report" match="any">
         <group delimiter=": ">
-          <text variable="publisher-place" />
-          <text variable="publisher" />
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
         </group>
       </if>
       <else-if type="thesis" match="any">
         <group delimiter=", ">
-          <text variable="publisher" suffix="," />
-          <text variable="publisher-place" />
+          <text variable="publisher" suffix=","/>
+          <text variable="publisher-place"/>
         </group>
       </else-if>
       <else-if type="post-weblog webpage" match="none">
         <group delimiter=", ">
           <choose>
             <if variable="event version" type="speech motion_picture" match="none">
-              <text variable="genre" />
+              <text variable="genre"/>
             </if>
           </choose>
           <choose>
             <if type="article-journal article-magazine" match="none">
               <group delimiter=" ">
-                <text variable="publisher" suffix="," />
+                <text variable="publisher" suffix=","/>
                 <choose>
                   <if variable="publisher-place">
-                    <text variable="publisher-place" suffix="," />
-                    <label variable="page" form="short" />
-                    <text variable="page" />
+                    <text variable="publisher-place" suffix=","/>
+                    <label variable="page" form="short"/>
+                    <text variable="page"/>
                   </if>
                   <else>
-                    <text variable="event-place" />
+                    <text variable="event-place"/>
                   </else>
                 </choose>
               </group>
@@ -302,20 +302,20 @@
           <if variable="event">
             <choose>
               <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" " />
-                <text variable="event" />
+                <text term="presented at" text-case="capitalize-first" suffix=" "/>
+                <text variable="event"/>
               </if>
               <else>
                 <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first" />
-                  <text term="presented at" />
-                  <text variable="event" />
+                  <text variable="genre" text-case="capitalize-first"/>
+                  <text term="presented at"/>
+                  <text variable="event"/>
                 </group>
               </else>
             </choose>
           </if>
           <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first" />
+            <text variable="genre" text-case="capitalize-first"/>
           </else-if>
         </choose>
       </if>
@@ -328,19 +328,19 @@
           <if variable="issued">
             <group prefix=" ">
               <date variable="issued">
-                <date-part name="year" />
+                <date-part name="year"/>
               </date>
-              <text variable="year-suffix" />
+              <text variable="year-suffix"/>
               <choose>
                 <if type="speech" match="any">
                   <date variable="issued">
-                    <date-part prefix=", " name="month" />
+                    <date-part prefix=", " name="month"/>
                   </date>
                 </if>
                 <else-if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song dataset" match="none">
                   <date variable="issued">
-                    <date-part prefix=", " name="month" />
-                    <date-part prefix=" " name="day" />
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
                   </date>
                 </else-if>
               </choose>
@@ -348,14 +348,14 @@
           </if>
           <else-if variable="status">
             <group prefix=" (" suffix=")">
-              <text variable="status" />
-              <text variable="year-suffix" prefix="-" />
+              <text variable="status"/>
+              <text variable="year-suffix" prefix="-"/>
             </group>
           </else-if>
           <else>
             <group prefix=" (" suffix=")">
-              <text term="no date" form="short" />
-              <text variable="year-suffix" prefix="-" />
+              <text term="no date" form="short"/>
+              <text variable="year-suffix" prefix="-"/>
             </group>
           </else>
         </choose>
@@ -366,14 +366,14 @@
     <choose>
       <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song dataset" match="none">
         <date variable="issued">
-          <date-part name="year" />
-          <date-part name="month" />
-          <date-part name="day" />
+          <date-part name="year"/>
+          <date-part name="month"/>
+          <date-part name="day"/>
         </date>
       </if>
       <else>
         <date variable="issued">
-          <date-part name="year" />
+          <date-part name="year"/>
         </date>
       </else>
     </choose>
@@ -382,22 +382,22 @@
     <choose>
       <if variable="issued">
         <group delimiter="/">
-          <date variable="original-date" form="text" />
+          <date variable="original-date" form="text"/>
           <group>
             <date variable="issued">
-              <date-part name="year" />
+              <date-part name="year"/>
             </date>
-            <text variable="year-suffix" />
+            <text variable="year-suffix"/>
           </group>
         </group>
       </if>
       <else-if variable="status">
-        <text variable="status" />
-        <text variable="year-suffix" prefix="-" />
+        <text variable="status"/>
+        <text variable="year-suffix" prefix="-"/>
       </else-if>
       <else>
-        <text term="no date" form="short" />
-        <text variable="year-suffix" prefix="-" />
+        <text term="no date" form="short"/>
+        <text variable="year-suffix" prefix="-"/>
       </else>
     </choose>
   </macro>
@@ -405,12 +405,12 @@
     <choose>
       <if is-numeric="edition">
         <group delimiter=" ">
-          <number variable="edition" form="ordinal" />
-          <text term="edition" form="short" />
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
-        <text variable="edition" />
+        <text variable="edition"/>
       </else>
     </choose>
   </macro>
@@ -419,16 +419,16 @@
       <if type="article-journal article-magazine" match="any">
         <group prefix=", " delimiter=", ">
           <group>
-            <text variable="volume" font-style="normal" font-weight="bold" />
-            <text variable="issue" prefix="(" suffix=")" />
+            <text variable="volume" font-style="normal" font-weight="bold"/>
+            <text variable="issue" prefix="(" suffix=")"/>
           </group>
-          <text variable="page" />
+          <text variable="page"/>
         </group>
         <choose>
           <if variable="issued">
             <choose>
               <if variable="page issue" match="none">
-                <text variable="status" prefix=". " />
+                <text variable="status" prefix=". "/>
               </if>
             </choose>
           </if>
@@ -436,46 +436,46 @@
       </if>
       <else-if type="article-newspaper">
         <group delimiter=" " prefix=", ">
-          <label variable="page" form="short" />
-          <text variable="page" />
+          <label variable="page" form="short"/>
+          <text variable="page"/>
         </group>
       </else-if>
       <else-if type="book graphic motion_picture report song  paper-conference entry-encyclopedia entry-dictionary" match="any">
         <group prefix=" (" suffix=")" delimiter=", ">
           <choose>
             <if type="report" match="none">
-              <text macro="edition" />
+              <text macro="edition"/>
             </if>
           </choose>
           <choose>
             <if variable="volume" match="any">
               <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" " />
-                <number variable="volume" form="numeric" />
+                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+                <number variable="volume" form="numeric"/>
               </group>
             </if>
             <else>
               <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" " />
-                <number variable="number-of-volumes" form="numeric" prefix="1–" />
+                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
+                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
               </group>
             </else>
           </choose>
           <group>
-            <label variable="page" form="short" suffix=" " />
-            <text variable="page" />
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
           </group>
         </group>
       </else-if>
       <else-if type="legal_case">
         <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority" />
-          <date variable="issued" form="text" />
+          <text variable="authority"/>
+          <date variable="issued" form="text"/>
         </group>
       </else-if>
       <else-if type="bill legislation" match="any">
         <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year" />
+          <date-part name="year"/>
         </date>
       </else-if>
     </choose>
@@ -484,13 +484,13 @@
     <group>
       <choose>
         <if locator="chapter">
-          <label variable="locator" form="long" text-case="capitalize-first" />
+          <label variable="locator" form="long" text-case="capitalize-first"/>
         </if>
         <else>
-          <label variable="locator" form="short" />
+          <label variable="locator" form="short"/>
         </else>
       </choose>
-      <text variable="locator" prefix=" " />
+      <text variable="locator" prefix=" "/>
     </group>
   </macro>
   <macro name="container">
@@ -499,13 +499,13 @@
         <group>
           <choose>
             <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=": " />
+              <text term="in" text-case="capitalize-first" suffix=": "/>
             </if>
           </choose>
           <group delimiter=", ">
-            <text macro="container-title" />
-            <text macro="container-contributors" />
-            <text macro="secondary-contributors" />
+            <text macro="container-title"/>
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
           </group>
         </group>
       </if>
@@ -514,10 +514,10 @@
   <macro name="container-title">
     <choose>
       <if type="article article-journal article-magazine article-newspaper" match="any">
-        <text variable="container-title" font-style="italic" text-case="title" />
+        <text variable="container-title" font-style="italic" text-case="title"/>
       </if>
       <else-if type="bill legal_case legislation" match="none">
-        <text variable="container-title" font-style="italic" />
+        <text variable="container-title" font-style="italic"/>
       </else-if>
     </choose>
   </macro>
@@ -527,24 +527,24 @@
         <group delimiter=" " prefix=", ">
           <choose>
             <if variable="container-title">
-              <text variable="volume" />
-              <text variable="container-title" />
+              <text variable="volume"/>
+              <text variable="container-title"/>
               <group delimiter=" ">
-                <text term="section" form="symbol" />
-                <text variable="section" />
+                <text term="section" form="symbol"/>
+                <text variable="section"/>
               </group>
-              <text variable="page" />
+              <text variable="page"/>
             </if>
             <else>
               <choose>
                 <if type="legal_case">
-                  <text variable="number" prefix="No. " />
+                  <text variable="number" prefix="No. "/>
                 </if>
                 <else>
-                  <text variable="number" prefix="Pub. L. No. " />
+                  <text variable="number" prefix="Pub. L. No. "/>
                   <group delimiter=" ">
-                    <text term="section" form="symbol" />
-                    <text variable="section" />
+                    <text term="section" form="symbol"/>
+                    <text variable="section"/>
                   </group>
                 </else>
               </choose>
@@ -558,48 +558,48 @@
     <choose>
       <if variable="original-date">
         <group prefix="(" suffix=")" delimiter=" ">
-          <text value="Original work published" />
-          <date variable="original-date" form="text" />
+          <text value="Original work published"/>
+          <date variable="original-date" form="text"/>
         </group>
       </if>
     </choose>
   </macro>
   <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" givenname-disambiguation-rule="primary-name">
     <sort>
-      <key macro="issued-sort" />
-      <key macro="author" />
+      <key macro="issued-sort"/>
+      <key macro="author"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=" ">
-        <text macro="author-short" />
-        <text macro="issued-year" />
-        <text macro="citation-locator" />
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
       </group>
     </layout>
   </citation>
   <bibliography et-al-use-last="true" entry-spacing="0" line-spacing="2" hanging-indent="true">
     <sort>
-      <key macro="author" />
-      <key macro="issued-sort" sort="ascending" />
-      <key macro="title" />
+      <key macro="author"/>
+      <key macro="issued-sort" sort="ascending"/>
+      <key macro="title"/>
     </sort>
     <layout>
       <group suffix=".">
         <group delimiter=" ">
-          <text macro="author" />
-          <text macro="issued" />
-          <text macro="title-plus-extra" />
-          <text macro="container" />
+          <text macro="author"/>
+          <text macro="issued"/>
+          <text macro="title-plus-extra"/>
+          <text macro="container"/>
         </group>
-        <text macro="legal-cites" />
-        <text macro="locators" />
+        <text macro="legal-cites"/>
+        <text macro="locators"/>
         <group delimiter=", " prefix=". ">
-          <text macro="event" />
-          <text macro="publisher" />
+          <text macro="event"/>
+          <text macro="publisher"/>
         </group>
       </group>
-      <text macro="access" prefix=" " />
-      <text macro="original-date" prefix=" " />
+      <text macro="access" prefix=" "/>
+      <text macro="original-date" prefix=" "/>
     </layout>
   </bibliography>
 </style>
diff --git a/mind-and-language.csl b/mind-and-language.csl
index a883905b4e..f5d5aba474 100644
--- a/mind-and-language.csl
+++ b/mind-and-language.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="in-text" version="1.0" page-range-format="chicago" 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="in-text" version="1.0" page-range-format="chicago" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Mind &amp; Language</title>
     <id>http://www.zotero.org/styles/mind-and-language</id>
diff --git a/radiochimica-acta.csl b/radiochimica-acta.csl
index 06b8405688..0c707ee4a0 100644
--- a/radiochimica-acta.csl
+++ b/radiochimica-acta.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" default-locale="en-GB" xmlns="http://purl.org/net/xbiblio/csl">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Radiochimica Acta</title>
     <id>http://www.zotero.org/styles/radiochimica-acta</id>
diff --git a/world-applied-sciences-journal.csl b/world-applied-sciences-journal.csl
index 99e80dd106..145d5fe160 100644
--- a/world-applied-sciences-journal.csl
+++ b/world-applied-sciences-journal.csl
@@ -37,7 +37,7 @@
   </macro>
   <macro name="year-date">
     <date date-parts="year" form="text" variable="issued" suffix=". "/>
-  </macro> 
+  </macro>
   <macro name="publisher">
     <text variable="publisher"/>
   </macro>
@@ -92,7 +92,7 @@
           <text macro="editor" suffix=", "/>
           <text macro="edition" suffix=", "/>
           <text macro="publisher"/>
-          <group delimiter=": "  prefix=", ">
+          <group delimiter=": " prefix=", ">
             <label variable="page" strip-periods="true" form="short"/>
             <text variable="page"/>
           </group>
diff --git a/zwitscher-maschine.csl b/zwitscher-maschine.csl
index 61a234282a..e45b652fdf 100644
--- a/zwitscher-maschine.csl
+++ b/zwitscher-maschine.csl
@@ -48,7 +48,7 @@
   <macro name="author">
     <names variable="author">
       <name delimiter=", " and="text" delimiter-precedes-last="never"/>
-      <label form="short" text-case="capitalize-first"  prefix=" (" suffix=")"/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=")"/>
       <substitute>
         <names variable="editor"/>
         <text variable="title" form="short"/>
@@ -58,7 +58,7 @@
   <macro name="editor-translator">
     <names variable="editor translator">
       <label form="verb-short" suffix=" "/>
-      <name  delimiter=", " and="text" delimiter-precedes-last="never"/>
+      <name delimiter=", " and="text" delimiter-precedes-last="never"/>
     </names>
   </macro>
   <macro name="container-title">
@@ -153,14 +153,14 @@
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true">
     <layout delimiter="; ">
       <group delimiter=", ">
-	<group delimiter=" ">
+        <group delimiter=" ">
           <text macro="author-short"/>
           <text macro="year-date"/>
-	</group>
-	<group delimiter=" ">
-	  <label variable="locator" form="short"/>
-	  <text variable="locator"/>
-	</group>
+        </group>
+        <group delimiter=" ">
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
       </group>
     </layout>
   </citation>