diff --git a/acta-materialia.csl b/acta-materialia.csl
index 733a86e21d..e4f59a1971 100644
--- a/acta-materialia.csl
+++ b/acta-materialia.csl
@@ -24,25 +24,25 @@
   </info>
   <macro name="author">
     <names variable="author">
-    <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-    <label form="long" prefix=", " text-case="lowercase" suffix="."/>
-    <substitute>
-      <names variable="editor"/>
-      <names variable="translator"/>
-    </substitute>
+      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="long" prefix=", " text-case="lowercase" suffix="."/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
     </names>
   </macro>
   <macro name="editor">
     <names variable="editor">
-    <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-    <label form="short" prefix=" (" text-case="title" suffix=")."/>
+      <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" (" text-case="title" suffix=")."/>
     </names>
   </macro>
   <macro name="year-date">
     <choose>
       <if variable="issued">
         <date variable="issued">
-        <date-part name="year"/>
+          <date-part name="year"/>
         </date>
       </if>
       <else>
@@ -78,76 +78,76 @@
   </citation>
   <bibliography entry-spacing="0" second-field-align="flush">
     <layout suffix=".">
-    <text variable="citation-number" prefix="[" suffix="]"/>
-    <text macro="author" suffix=". "/>
-    <choose>
-      <if type="bill book graphic legal_case motion_picture report song" match="any">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title" text-case="title"/>
-            <text variable="volume" prefix="vol. "/>
-            <text macro="edition"/>
-          </group>
-          <text macro="publisher"/>
-        </group>
-      </if>
-      <else-if type="chapter paper-conference" match="any">
-        <group delimiter=". ">
-          <text variable="title" text-case="title" suffix=", in:"/>
-          <text macro="editor"/>
-          <group delimiter=", ">
-            <text variable="container-title" form="short" text-case="title"/>
-            <text variable="volume" prefix="vol. "/>
-            <text macro="edition"/>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter=". ">
+            <group delimiter=", ">
+              <text variable="title" text-case="title"/>
+              <text variable="volume" prefix="vol. "/>
+              <text macro="edition"/>
+            </group>
+            <text macro="publisher"/>
           </group>
-          <text macro="publisher"/>
-        </group>
-      </else-if>
-      <else-if type="patent">
-        <group delimiter=", ">
+        </if>
+        <else-if type="chapter paper-conference" match="any">
           <group delimiter=". ">
-            <text variable="title" text-case="title"/>
-            <text variable="number" prefix="U.S. Patent "/>
+            <text variable="title" text-case="title" suffix=", in:"/>
+            <text macro="editor"/>
+            <group delimiter=", ">
+              <text variable="container-title" form="short" text-case="title"/>
+              <text variable="volume" prefix="vol. "/>
+              <text macro="edition"/>
+            </group>
+            <text macro="publisher"/>
           </group>
-          <text macro="year-date"/>
-        </group>
-      </else-if>
-      <else-if type="thesis">
-        <group delimiter=". ">
-          <text variable="title" text-case="title"/>
-          <text variable="genre"/>
+        </else-if>
+        <else-if type="patent">
           <group delimiter=", ">
-            <text variable="publisher"/>
+            <group delimiter=". ">
+              <text variable="title" text-case="title"/>
+              <text variable="number" prefix="U.S. Patent "/>
+            </group>
             <text macro="year-date"/>
           </group>
-        </group>
-      </else-if>
-      <else-if type="webpage">
-        <group delimiter=". ">
-          <group delimiter=", ">
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=". ">
             <text variable="title" text-case="title"/>
-            <date variable="accessed">
-              <date-part name="day" suffix=" " prefix="accessed "/>
-              <date-part name="month" form="short" suffix=" "/>
-              <date-part name="year"/>
-            </date>
-          </group>
-          <text variable="URL" prefix="URL:&#160;"/>
-        </group>
-      </else-if>
-      <else>
-        <group delimiter=":">
-          <group delimiter=" ">
-            <text variable="container-title" form="short" strip-periods="true" />
-            <group delimiter=";">
+            <text variable="genre"/>
+            <group delimiter=", ">
+              <text variable="publisher"/>
               <text macro="year-date"/>
-              <text variable="volume"/>
             </group>
           </group>
-          <text variable="page-first"/>
-        </group>
-      </else>
-    </choose>
+        </else-if>
+        <else-if type="webpage">
+          <group delimiter=". ">
+            <group delimiter=", ">
+              <text variable="title" text-case="title"/>
+              <date variable="accessed">
+                <date-part name="day" suffix=" " prefix="accessed "/>
+                <date-part name="month" form="short" suffix=" "/>
+                <date-part name="year"/>
+              </date>
+            </group>
+            <text variable="URL" prefix="URL: "/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=":">
+            <group delimiter=" ">
+              <text variable="container-title" form="short" strip-periods="true"/>
+              <group delimiter=";">
+                <text macro="year-date"/>
+                <text variable="volume"/>
+              </group>
+            </group>
+            <text variable="page-first"/>
+          </group>
+        </else>
+      </choose>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/advanced-materials.csl b/advanced-materials.csl
index 916b6d5546..4058466f12 100644
--- a/advanced-materials.csl
+++ b/advanced-materials.csl
@@ -146,4 +146,4 @@
       </choose>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/american-journal-of-human-genetics.csl b/american-journal-of-human-genetics.csl
index d940ecff58..31d0a23c6c 100644
--- a/american-journal-of-human-genetics.csl
+++ b/american-journal-of-human-genetics.csl
@@ -57,7 +57,7 @@
       <key variable="citation-number"/>
     </sort>
     <layout suffix=".">
-	  <text variable="citation-number" suffix=". "/>
+      <text variable="citation-number" suffix=". "/>
       <group delimiter=" ">
         <text macro="author"/>
         <text macro="issued" prefix="(" suffix=")."/>
diff --git a/apa.csl b/apa.csl
index ce432e6446..7d2653ae0f 100644
--- a/apa.csl
+++ b/apa.csl
@@ -235,19 +235,19 @@
           <if variable="issued">
             <group prefix=" (" suffix=").">
               <date variable="issued">
-              <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-                <choose>
-                  <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
-                    <date variable="issued">
-                      <date-part prefix=", " name="month"/>
-                      <date-part prefix=" " name="day"/>
-                    </date>
-                  </if>
-                </choose>
-               </group>
-             </if>
+                <date-part name="year"/>
+              </date>
+              <text variable="year-suffix"/>
+              <choose>
+                <if type="bill book graphic legal_case motion_picture report song article-journal chapter paper-conference" match="none">
+                  <date variable="issued">
+                    <date-part prefix=", " name="month"/>
+                    <date-part prefix=" " name="day"/>
+                  </date>
+                </if>
+              </choose>
+            </group>
+          </if>
           <else>
             <group prefix=" (" suffix=").">
               <text term="no date" form="short"/>
@@ -344,9 +344,9 @@
             <date-part name="year"/>
           </date>
         </group>
-             </else-if>
-             <else-if type="bill">
-        <date variable="issued" prefix=" (" suffix=")" >
+      </else-if>
+      <else-if type="bill">
+        <date variable="issued" prefix=" (" suffix=")">
           <date-part name="year"/>
         </date>
       </else-if>
@@ -379,10 +379,10 @@
             <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=" ">
                     <!--change to label variable="section" as that becomes available -->
                     <text term="section" form="symbol"/>
@@ -418,7 +418,7 @@
       <group suffix=".">
         <group delimiter=". ">
           <text macro="author"/>
-          <text macro="issued" />
+          <text macro="issued"/>
         </group>
         <group delimiter=". ">
           <text macro="title" prefix=" "/>
@@ -426,7 +426,7 @@
             <text macro="container-contributors"/>
             <text macro="secondary-contributors"/>
             <group delimiter=", ">
-              <text macro="container" />
+              <text macro="container"/>
               <text variable="collection-title"/>
             </group>
           </group>
diff --git a/australian-journal-of-grape-and-wine-research.csl b/australian-journal-of-grape-and-wine-research.csl
index 778611be52..ad0ab69888 100644
--- a/australian-journal-of-grape-and-wine-research.csl
+++ b/australian-journal-of-grape-and-wine-research.csl
@@ -57,7 +57,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with=". "/> 
+      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -170,7 +170,7 @@
       <if type="article-journal article-magazine article-newspaper" match="any">
         <group prefix=" " delimiter=", ">
           <group>
-            <text variable="volume" font-weight="bold"/> 
+            <text variable="volume" font-weight="bold"/>
           </group>
           <text variable="page"/>
         </group>
@@ -198,8 +198,8 @@
       <key macro="issued"/>
       <key macro="author"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter=", "> 
-      <group delimiter=" "> 
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <group delimiter=" ">
         <text macro="author-short"/>
         <text macro="issued"/>
       </group>
@@ -213,7 +213,7 @@
     <layout>
       <group suffix=".">
         <text macro="author" suffix=", "/>
-        <text macro="issued" prefix="(" suffix=") "/> 
+        <text macro="issued" prefix="(" suffix=") "/>
         <group>
           <text macro="title"/>
           <text macro="container"/>
diff --git a/bioessays.csl b/bioessays.csl
index 3b10d4a033..282621b39c 100644
--- a/bioessays.csl
+++ b/bioessays.csl
@@ -24,10 +24,10 @@
     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <macro name="author">
-          <names variable="author" suffix="">
-            <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " font-weight="bold" delimiter-precedes-last="always"/>
-            <et-al font-weight="normal"/>
-          </names>
+    <names variable="author" suffix="">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " font-weight="bold" delimiter-precedes-last="always"/>
+      <et-al font-weight="normal"/>
+    </names>
   </macro>
   <citation collapse="citation-number">
     <sort>
@@ -42,7 +42,7 @@
       <choose>
         <if type="book">
           <text variable="citation-number" suffix=". "/>
-            <text macro="author"/>
+          <text macro="author"/>
           <date variable="issued" suffix=" ">
             <date-part name="year" form="long" prefix=". " suffix=". "/>
           </date>
@@ -52,7 +52,7 @@
         </if>
         <else-if type="chapter">
           <text variable="citation-number" suffix=". "/>
-            <text macro="author"/>
+          <text macro="author"/>
           <date variable="issued" suffix=" ">
             <date-part name="year" form="long" prefix=". " suffix=". "/>
           </date>
@@ -66,7 +66,7 @@
         </else-if>
         <else>
           <text variable="citation-number" suffix=". "/>
-            <text macro="author"/>
+          <text macro="author"/>
           <date variable="issued" suffix=" ">
             <date-part name="year" form="long" prefix=". " suffix=". "/>
           </date>
diff --git a/cell-transplantation.csl b/cell-transplantation.csl
index 3553337eed..a53e7c1576 100644
--- a/cell-transplantation.csl
+++ b/cell-transplantation.csl
@@ -24,12 +24,12 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name sort-separator=", " initialize-with=". "  name-as-sort-order="all" delimiter="; "  delimiter-precedes-last="always"/>  
+      <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
     </names>
   </macro>
   <macro name="publisher">
     <group delimiter=": ">
-      <text variable="publisher-place"/>      
+      <text variable="publisher-place"/>
       <text variable="publisher" suffix="; "/>
     </group>
   </macro>
@@ -62,14 +62,14 @@
         <choose>
           <if type="book" match="any">
             <group suffix=" ">
-              <text macro="editor" suffix=" "/>              
-	      <text variable="title"  suffix=","/>
+              <text macro="editor" suffix=" "/>
+              <text variable="title" suffix=","/>
               <text macro="edition" prefix=" "/>
             </group>
             <text prefix=" " macro="publisher"/>
-	    <date variable="issued" suffix=".">
-	      <date-part name="year"/>
-	    </date>
+            <date variable="issued" suffix=".">
+              <date-part name="year"/>
+            </date>
             <group suffix=". " prefix="; ">
               <text variable="page" prefix=":"/>
             </group>
@@ -78,27 +78,27 @@
             <group delimiter=" ">
               <text variable="title" suffix="."/>
               <text term="in" text-case="capitalize-first" suffix=": "/>
-              <text macro="editor"  suffix=", "/>
-	      <text term="edition" form="short" suffix="." strip-periods="true"/>              
-	      <group>
-		<text variable="container-title" suffix=". "/>
-		<text variable="collection-title" prefix=". "/>
-	      </group>
+              <text macro="editor" suffix=", "/>
+              <text term="edition" form="short" suffix="." strip-periods="true"/>
+              <group>
+                <text variable="container-title" suffix=". "/>
+                <text variable="collection-title" prefix=". "/>
+              </group>
               <text macro="publisher"/>
-	      <date variable="issued" suffix=":">
-		<date-part name="year"/>
-	      </date>		
-              <text variable="volume" prefix="vol. " suffix="."/>                
+              <date variable="issued" suffix=":">
+                <date-part name="year"/>
+              </date>
+              <text variable="volume" prefix="vol. " suffix="."/>
               <text variable="page"/>
             </group>
           </else-if>
           <else>
             <text variable="title" suffix=". "/>
-            <text variable="container-title" form="short"  suffix=". "/>
-	    <group delimiter=": ">
-	      <text variable="volume"/>
-	      <text variable="page" suffix="; "/>
-	    </group>
+            <text variable="container-title" form="short" suffix=". "/>
+            <group delimiter=": ">
+              <text variable="volume"/>
+              <text variable="page" suffix="; "/>
+            </group>
             <date variable="issued" suffix=".">
               <date-part name="year"/>
             </date>
@@ -107,4 +107,4 @@
       </group>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/circulation.csl b/circulation.csl
index 8a8ce19f73..5531d433d3 100644
--- a/circulation.csl
+++ b/circulation.csl
@@ -122,7 +122,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout vertical-align="sup"  delimiter=",">
+    <layout vertical-align="sup" delimiter=",">
       <text variable="citation-number"/>
     </layout>
   </citation>
diff --git a/european-respiratory-journal.csl b/european-respiratory-journal.csl
index f67e6a040f..08183ee6c5 100644
--- a/european-respiratory-journal.csl
+++ b/european-respiratory-journal.csl
@@ -1,5 +1,5 @@
 <?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="minimal" default-locale="en-US">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="minimal" default-locale="en-US">
   <info>
     <title>European Respiratory Journal</title>
     <id>http://www.zotero.org/styles/european-respiratory-journal</id>
diff --git a/harvard-anglia-ruskin.csl b/harvard-anglia-ruskin.csl
index a8ca5232d5..0b4d0d8e0b 100644
--- a/harvard-anglia-ruskin.csl
+++ b/harvard-anglia-ruskin.csl
@@ -26,7 +26,7 @@
       <else-if type="legal_case" match="any">
         <text variable="title" font-style="italic"/>
       </else-if>
-      <else>   
+      <else>
         <names variable="author">
           <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", " suffix=","/>
           <label form="short" prefix=" " suffix="." text-case="lowercase" strip-periods="true"/>
@@ -53,12 +53,12 @@
         <choose>
           <if type="legal_case" match="any">
             <date variable="issued">
-	      <date-part name="year" prefix="[" suffix="]"/>
+              <date-part name="year" prefix="[" suffix="]"/>
             </date>
           </if>
           <else-if variable="issued">
             <date variable="issued">
-	      <date-part name="year"/>
+              <date-part name="year"/>
             </date>
           </else-if>
           <else-if variable="accessed">
@@ -98,7 +98,7 @@
                 <text variable="title" font-style="italic"/>
                 <text macro="edition-no"/>
               </group>
-	      <text variable="collection-title"/>
+              <text variable="collection-title"/>
             </group>
           </if>
         </choose>
@@ -146,15 +146,15 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name and="text" initialize-with="." delimiter=". "  prefix="Translated by " suffix="."/>
+      <name and="text" initialize-with="." delimiter=". " prefix="Translated by " suffix="."/>
     </names>
   </macro>
   <macro name="bill-detail">
     <choose>
       <if type="bill">
         <group delimiter=". ">
-	  <text variable="section"/>
-	  <text variable="volume"/>
+          <text variable="section"/>
+          <text variable="volume"/>
         </group>
       </if>
     </choose>
@@ -167,16 +167,16 @@
         </group>
       </if>
       <else-if type="manuscript">
-        <group delimiter=", ">  
+        <group delimiter=", ">
           <text variable="archive"/>
-	  <group delimiter=". ">          
+          <group delimiter=". ">
             <text variable="archive_location"/>
             <text variable="publisher-place"/>
-	  </group>
+          </group>
         </group>
       </else-if>
       <else>
-	<group delimiter=": ">
+        <group delimiter=": ">
           <text variable="publisher-place"/>
           <text variable="publisher"/>
         </group>
@@ -188,27 +188,27 @@
       <if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
         <group suffix=".">
           <text term="in" text-case="capitalize-first" suffix=": "/>
-	  <group delimiter=", ">
-	    <names variable="editor" delimiter=", ">
-	      <name  and="text" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/>
-	      <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
-	    </names>
-	    <group delimiter=", ">
-	      <text variable="container-title" font-style="italic"/>
-	      <text variable="collection-title"/>
-	      <choose>
-		<if is-numeric="edition">
-		  <group delimiter=" ">
+          <group delimiter=", ">
+            <names variable="editor" delimiter=", ">
+              <name and="text" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/>
+              <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+            </names>
+            <group delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <text variable="collection-title"/>
+              <choose>
+                <if is-numeric="edition">
+                  <group delimiter=" ">
                     <number variable="edition" form="ordinal"/>
                     <text term="edition" form="short" suffix="." text-case="lowercase" strip-periods="true"/>
-		  </group>
-		</if>
-		<else>
-		  <text variable="edition" suffix="."/>
-		</else>
-	      </choose>
-	    </group>
-	  </group>
+                  </group>
+                </if>
+                <else>
+                  <text variable="edition" suffix="."/>
+                </else>
+              </choose>
+            </group>
+          </group>
         </group>
       </if>
       <else-if type="webpage bill" match="any">
@@ -218,7 +218,7 @@
         <text variable="container-title"/>
       </else-if>
       <else-if type="patent">
-	<text variable="number" suffix="."/>
+        <text variable="number" suffix="."/>
       </else-if>
       <else-if type="motion_picture">
         <text variable="medium" prefix="[" suffix="]"/>
@@ -255,17 +255,17 @@
       <choose>
         <if type="legal_case">
           <group>
-            <text variable="volume" prefix =" "/>
+            <text variable="volume" prefix=" "/>
             <text variable="authority" prefix=" (" suffix=")"/>
           </group>
-          <group>              
+          <group>
             <label variable="page" text-case="lowercase" form="short"/>
             <text variable="page"/>
           </group>
         </if>
       </choose>
     </group>
-  </macro>  
+  </macro>
   <macro name="locator">
     <choose>
       <if type="article-journal article-newspaper article-magazine interview" match="any">
@@ -274,46 +274,46 @@
             <text variable="volume"/>
             <text variable="issue" prefix="(" suffix=")"/>
           </group>
-	  <choose>
-	    <if type="article-magazine article-newspaper interview" match="any">
-	      <date variable="issued" delimiter=" ">
+          <choose>
+            <if type="article-magazine article-newspaper interview" match="any">
+              <date variable="issued" delimiter=" ">
                 <date-part name="day"/>
                 <date-part name="month" form="short"/>
-	      </date>
-	    </if>
-	  </choose>
-	  <choose>
-	    <if variable="page">
-	      <group>
-		<label variable="page" text-case="lowercase" form="short"/>
-		<text variable="page"/>
-	      </group>
-	    </if>
-	  </choose>
+              </date>
+            </if>
+          </choose>
+          <choose>
+            <if variable="page">
+              <group>
+                <label variable="page" text-case="lowercase" form="short"/>
+                <text variable="page"/>
+              </group>
+            </if>
+          </choose>
         </group>
       </if>
       <else-if type="book chapter paper-conference manuscript entry-dictionary entry-encyclopedia thesis motion_picture song report" match="any">
         <group suffix=".">
-          <text variable="event" suffix=". "/>             
-	  <group delimiter=", ">
-	    <text macro="publisher"/>
-	    <group>
-	      <label variable="page" text-case="lowercase" form="short"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
+          <text variable="event" suffix=". "/>
+          <group delimiter=", ">
+            <text macro="publisher"/>
+            <group>
+              <label variable="page" text-case="lowercase" form="short"/>
+              <text variable="page"/>
+            </group>
+          </group>
         </group>
       </else-if>
       <else-if type="broadcast">
         <group delimiter=". ">
-	  <text variable="event"/>
-	  <text macro="publisher"/>
-	  <group>
-	    <date variable="issued" delimiter=" ">
-	      <date-part name="day"/>
-	      <date-part name="month" form="short"/>
-	    </date>
-	  </group>
+          <text variable="event"/>
+          <text macro="publisher"/>
+          <group>
+            <date variable="issued" delimiter=" ">
+              <date-part name="day"/>
+              <date-part name="month" form="short"/>
+            </date>
+          </group>
         </group>
       </else-if>
     </choose>
@@ -324,14 +324,14 @@
         <group>
           <text value="Available at: " prefix=" "/>
           <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-          <group prefix=" [" suffix="]." >
-	    <text term="accessed" text-case="capitalize-first" suffix=" "/>
-	    <date variable="accessed" delimiter=" ">
-	      <date-part name="day"/>
-	      <date-part name="month" form="short"/>
-	      <date-part name="year"/>
-	    </date>
-	  </group>
+          <group prefix=" [" suffix="].">
+            <text term="accessed" text-case="capitalize-first" suffix=" "/>
+            <date variable="accessed" delimiter=" ">
+              <date-part name="day"/>
+              <date-part name="month" form="short"/>
+              <date-part name="year"/>
+            </date>
+          </group>
         </group>
       </if>
     </choose>
@@ -342,21 +342,21 @@
         <text variable="title"/>
       </if>
       <else>
-	<names variable="author">
-	  <name form="short" and="text" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/>
-	  <substitute>
-	    <names variable="editor"/>
-	    <text variable="title"/>
-	  </substitute>
-	</names>
+        <names variable="author">
+          <name form="short" and="text" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/>
+          <substitute>
+            <names variable="editor"/>
+            <text variable="title"/>
+          </substitute>
+        </names>
       </else>
     </choose>
   </macro>
   <citation et-al-min="5" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="true" collapse="year-suffix">
     <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", " >
-        <group delimiter=", " >
-          <text macro="author-short" />
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <text macro="author-short"/>
           <text macro="year-date"/>
         </group>
         <group prefix=" ">
@@ -375,23 +375,23 @@
     <layout suffix=".">
       <group delimiter=" ">
         <text macro="cite-author"/>
-	<choose>
-	  <if type="legal_case" match="any">
-	    <text macro="year-date"/>
-	  </if>
-	  <else>
-	    <text macro="year-date" suffix=". "/>
-	  </else>
-	</choose>
+        <choose>
+          <if type="legal_case" match="any">
+            <text macro="year-date"/>
+          </if>
+          <else>
+            <text macro="year-date" suffix=". "/>
+          </else>
+        </choose>
       </group>
       <group delimiter=" ">
         <text macro="primary-title" suffix="."/>
         <text macro="genre-online-marker"/>
-	<group delimiter=". "  prefix=" ">
-	  <text macro="translator"/>
-	  <text macro="bill-detail"/>
-	  <text macro="container"/>
-	</group>
+        <group delimiter=". " prefix=" ">
+          <text macro="translator"/>
+          <text macro="bill-detail"/>
+          <text macro="container"/>
+        </group>
         <text macro="container-online"/>
         <text macro="legal-detail"/>
         <text macro="locator"/>
diff --git a/harvard-limerick.csl b/harvard-limerick.csl
index 83929c6bf2..e19a9cdc78 100644
--- a/harvard-limerick.csl
+++ b/harvard-limerick.csl
@@ -23,26 +23,26 @@
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <text term="in" text-case="lowercase"  suffix=" "/>
-	<group delimiter=", ">
-	  <names variable="editor translator" delimiter=", ">
-	    <name name-as-sort-order="all" sort-separator=", " and="text" initialize-with="." delimiter=", " delimiter-precedes-last="never"/>
-	    <label form="short" prefix=", " />
-	  </names>
-	  <group delimiter=", ">
-	    <text variable="container-title" text-case="title" font-style="italic"/>
-	    <text variable="collection-title" text-case="title"/>
-	  </group>
-	</group>
+        <text term="in" text-case="lowercase" suffix=" "/>
+        <group delimiter=", ">
+          <names variable="editor translator" delimiter=", ">
+            <name name-as-sort-order="all" sort-separator=", " and="text" initialize-with="." delimiter=", " delimiter-precedes-last="never"/>
+            <label form="short" prefix=", "/>
+          </names>
+          <group delimiter=", ">
+            <text variable="container-title" text-case="title" font-style="italic"/>
+            <text variable="collection-title" text-case="title"/>
+          </group>
+        </group>
       </if>
       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-        <group  delimiter=", ">
+        <group delimiter=", ">
           <text variable="container-title"/>
           <text variable="collection-title"/>
         </group>
       </else-if>
       <else>
-        <group  delimiter=", ">
+        <group delimiter=", ">
           <text variable="container-title" font-style="italic"/>
           <text variable="collection-title"/>
         </group>
@@ -63,16 +63,16 @@
   <macro name="author-short">
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with=". " delimiter-precedes-last="never"/>
-      <et-al font-style="italic" />
+      <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
         <choose>
           <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title"  font-style="italic"/>
+            <text variable="title" font-style="italic"/>
           </if>
           <else>
-            <text variable="title"  quotes="true"/>
+            <text variable="title" quotes="true"/>
           </else>
         </choose>
       </substitute>
@@ -83,14 +83,14 @@
       <if variable="URL">
         <group delimiter=" ">
           <text variable="URL" prefix="available: "/>
-	  <group prefix="[" suffix="]" delimiter=" ">
-	    <text term="accessed"/>
-	    <date variable="accessed" delimiter=" "> 
-	      <date-part name="day"/>
-	      <date-part name="month" form="short" strip-periods="true"/>
-	      <date-part name="year"/>
-	    </date>
-	  </group>
+          <group prefix="[" suffix="]" delimiter=" ">
+            <text term="accessed"/>
+            <date variable="accessed" delimiter=" ">
+              <date-part name="day"/>
+              <date-part name="month" form="short" strip-periods="true"/>
+              <date-part name="year"/>
+            </date>
+          </group>
         </group>
       </if>
     </choose>
@@ -98,21 +98,21 @@
   <macro name="title">
     <choose>
       <if type="report thesis" match="any">
-	<group delimiter=", ">
-	  <text variable="title" text-case="title" font-style="italic"/>
-	  <group delimiter=" ">
-	    <text variable="genre"/>
-	    <text variable="number"/>
-	  </group>
-	</group>
+        <group delimiter=", ">
+          <text variable="title" text-case="title" font-style="italic"/>
+          <group delimiter=" ">
+            <text variable="genre"/>
+            <text variable="number"/>
+          </group>
+        </group>
       </if>
       <else-if type="bill book graphic legal_case motion_picture report song speech" match="any">
         <text variable="title" font-style="italic" text-case="title"/>
-	<choose>
-	  <if variable="URL">
-	    <text term="online" prefix=" [" suffix="]"/>
-	  </if>
-	</choose>
+        <choose>
+          <if variable="URL">
+            <text term="online" prefix=" [" suffix="]"/>
+          </if>
+        </choose>
         <text macro="edition" prefix=", "/>
       </else-if>
       <else-if type="webpage">
@@ -188,30 +188,30 @@
   <macro name="locators">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <group  delimiter=", ">
+        <group delimiter=", ">
           <group>
             <text variable="volume"/>
-	    <text variable="issue" prefix="(" suffix=")"/>
+            <text variable="issue" prefix="(" suffix=")"/>
           </group>
-	  <choose>
-	    <if type="article-magazine article-newspaper" match="any">
-	      <date variable="issued" delimiter=" ">
-		<date-part name="day"/>
-		<date-part name="month" form="short" strip-periods="true"/>
-	      </date>
-	    </if>
-	  </choose>
+          <choose>
+            <if type="article-magazine article-newspaper" match="any">
+              <date variable="issued" delimiter=" ">
+                <date-part name="day"/>
+                <date-part name="month" form="short" strip-periods="true"/>
+              </date>
+            </if>
+          </choose>
           <text variable="page"/>
         </group>
       </if>
       <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-        <group delimiter=", " >
+        <group delimiter=", ">
           <text macro="event"/>
           <text macro="publisher"/>
         </group>
       </else-if>
       <else-if type="chapter paper-conference" match="any">
-        <group delimiter=", " >
+        <group delimiter=", ">
           <text macro="event"/>
           <text macro="publisher"/>
           <group>
@@ -228,17 +228,15 @@
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="issued"/>
-	</group>
-	<group>
-	  <label variable="locator" form="short"/>
-	  <text variable="locator"/>
-
-	</group>
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued"/>
+        </group>
+        <group>
+          <label variable="locator" form="short"/>
+          <text variable="locator"/>
+        </group>
       </group>
-
     </layout>
   </citation>
   <bibliography hanging-indent="true" entry-spacing="0" line-spacing="1">
@@ -251,13 +249,12 @@
         <text macro="author"/>
         <text macro="issued" prefix="(" suffix=")"/>
       </group>
-      <group delimiter=", "  prefix=" ">
-	<text macro="title"/>
-	<text macro="container"/>
+      <group delimiter=", " prefix=" ">
+        <text macro="title"/>
+        <text macro="container"/>
         <text macro="locators"/>
-	<text macro="access"/>
+        <text macro="access"/>
       </group>
-
     </layout>
   </bibliography>
 </style>
diff --git a/harvard-university-west-london.csl b/harvard-university-west-london.csl
index ed562e2a0b..d9fdee81d9 100755
--- a/harvard-university-west-london.csl
+++ b/harvard-university-west-london.csl
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style version="1.0" xmlns="http://purl.org/net/xbiblio/csl" class="in-text" default-locale="en-GB" page-range-format="expanded" demote-non-dropping-particle="sort-only" and="text" delimiter-precedes-last="never">
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="en-GB" page-range-format="expanded" demote-non-dropping-particle="sort-only" and="text" delimiter-precedes-last="never">
   <info>
     <author>
       <name>Peter L Jones</name>
@@ -57,7 +57,7 @@
   <macro name="title">
     <choose>
       <if type="book graphic" match="any">
-	<!-- webpage -->
+        <!-- webpage -->
         <text variable="title" font-style="italic"/>
       </if>
       <else-if variable="container-title" match="none">
@@ -160,14 +160,13 @@
       <text variable="collection-number"/>
     </group>
   </macro>
-  <citation disambiguate-add-year-suffix="true" collapse="year"
-	    et-al-min="3" et-al-use-first="1">
+  <citation disambiguate-add-year-suffix="true" collapse="year" et-al-min="3" et-al-use-first="1">
     <!-- sort as cited -->
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
         <text macro="year-date"/>
-	<!-- Does this next group do anything? -->
+        <!-- Does this next group do anything? -->
         <group>
           <label variable="locator" suffix="*" form="short" strip-periods="true"/>
           <text variable="locator"/>
@@ -183,19 +182,19 @@
     </sort>
     <layout>
       <group delimiter=". " suffix=".">
-	<!-- <text variable="type" prefix="[DEBUG: " suffix="]"/> -->
+        <!-- <text variable="type" prefix="[DEBUG: " suffix="]"/> -->
         <text macro="author"/>
         <text macro="year-date" prefix=" (" suffix=")"/>
         <choose>
           <if type="book graphic" match="any">
             <!--<text variable="note"/>-->
-	    <group delimiter=", ">
+            <group delimiter=", ">
               <text macro="title"/>
               <text macro="collection"/>
             </group>
             <text macro="edition"/>
             <text macro="editor"/>
-	    <group delimiter=", ">
+            <group delimiter=", ">
               <text macro="issued"/>
               <text macro="publisher"/>
               <text macro="pages"/>
@@ -203,30 +202,30 @@
           </if>
           <else-if type="chapter paper-conference" match="any">
             <text macro="title"/>
-	    <group delimiter=": ">
+            <group delimiter=": ">
               <text term="in" text-case="capitalize-first"/>
-	      <group delimiter=", ">
-		<text macro="editor"/>
-		<text variable="container-title" font-style="italic"/>
-		<text macro="collection"/>
-		<text macro="edition"/>
-		<text macro="vol_iss"/>
-		<text macro="issued"/>
-		<text macro="publisher"/>
-		<text macro="pages"/>
-	      </group>
+              <group delimiter=", ">
+                <text macro="editor"/>
+                <text variable="container-title" font-style="italic"/>
+                <text macro="collection"/>
+                <text macro="edition"/>
+                <text macro="vol_iss"/>
+                <text macro="issued"/>
+                <text macro="publisher"/>
+                <text macro="pages"/>
+              </group>
             </group>
           </else-if>
           <else>
-	    <!-- <else-if type="article-journal article-newspaper thesis webpage" match="any">broadcast personal_communication -->
+            <!-- <else-if type="article-journal article-newspaper thesis webpage" match="any">broadcast personal_communication -->
             <text macro="title"/>
             <text macro="edition"/>
             <text macro="editor"/>
-	    <group delimiter=", ">
+            <group delimiter=", ">
               <choose>
                 <if variable="author" match="any">
                   <text variable="container-title" font-style="italic"/>
-		  <!-- -->
+                  <!-- -->
                 </if>
               </choose>
               <text macro="vol_iss"/>
@@ -235,7 +234,7 @@
               <text macro="publisher"/>
               <text macro="pages"/>
             </group>
-	    <!--</else-if>-->
+            <!--</else-if>-->
           </else>
           <!--<else>
 	      <text macro="title"/>
diff --git a/heredity.csl b/heredity.csl
index b8fc986a94..a31ab3b447 100644
--- a/heredity.csl
+++ b/heredity.csl
@@ -29,39 +29,39 @@
     <names variable="author">
       <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
-      <et-al font-style="italic" />
+      <et-al font-style="italic"/>
       <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="title"/>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
   <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"/>
-	<choose>
-	  <if type="bill book graphic legal_case motion_picture report song" match="any">
-	    <text variable="title" form="short" font-style="italic"/>
-	  </if>
-	  <else>
-	    <text variable="title" form="short" quotes="true"/>
-	  </else>
-	</choose>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
       </substitute>
     </names>
   </macro>
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case motion_picture report song" match="any">
-	<text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic"/>
       </if>
       <else>
-	<text variable="title"/>
+        <text variable="title"/>
       </else>
     </choose>
   </macro>
@@ -74,13 +74,13 @@
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
-	<group delimiter=" ">
-	  <number variable="edition" form="ordinal"/>
-	  <text term="edition" form="short" suffix="n." strip-periods="true"/>
- 	</group>
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="n." strip-periods="true"/>
+        </group>
       </if>
       <else>
- 	<text variable="edition" suffix=""/>
+        <text variable="edition" suffix=""/>
       </else>
     </choose>
   </macro>
@@ -91,14 +91,14 @@
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-	<text macro="author-short"/>
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
-	<group>
-	  <label variable="locator" suffix="." form="short" strip-periods="true"/>
-	  <text variable="locator" prefix=" "/>
-	</group>
+        <text macro="author-short"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <group>
+          <label variable="locator" suffix="." form="short" strip-periods="true"/>
+          <text variable="locator" prefix=" "/>
+        </group>
       </group>
     </layout>
   </citation>
@@ -110,50 +110,50 @@
     <layout>
       <text macro="author" suffix=" "/>
       <date variable="issued" prefix="(" suffix=").">
-	<date-part name="year"/>
+        <date-part name="year"/>
       </date>
       <choose>
-	<if type="bill book graphic legal_case motion_picture report song" match="any">
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text macro="edition" prefix=", "/>
-	    <text macro="editor-translator" prefix=" "/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter paper-conference" match="any">
-	  <text macro="title" prefix=" "/>
-	  <group prefix=".">
-	    <group prefix=" In:" suffix="">
-	      <names variable="editor translator">
-		<name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" "/>
-		<label form="short" prefix=" (" suffix=") " strip-periods="true"/>
-	      </names>
-	      <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-	      <text variable="collection-title" prefix=" " suffix="."/>
-	      <group suffix=".">
-		<text macro="publisher" prefix=" "/>
-		<text variable="volume" prefix=" Vol "/>
-		<label variable="page" form="short" prefix=", " suffix=" " strip-periods="true"/>
-		<text variable="page" suffix="."/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor-translator" prefix=" "/>
-	  </group>
-	  <group prefix=" " suffix=".">
-	    <text variable="container-title" form="short" font-style="italic"/>
-	    <group prefix=" ">
-	      <text variable="volume" font-weight="bold"/>
-	    </group>
-	    <text variable="page" prefix=": "/>
-	  </group>
-	</else>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group suffix=".">
+            <text macro="title" prefix=" "/>
+            <text macro="edition" prefix=", "/>
+            <text macro="editor-translator" prefix=" "/>
+          </group>
+          <text prefix=" " suffix="." macro="publisher"/>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" prefix=" "/>
+          <group prefix=".">
+            <group prefix=" In:" suffix="">
+              <names variable="editor translator">
+                <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always" prefix=" "/>
+                <label form="short" prefix=" (" suffix=") " strip-periods="true"/>
+              </names>
+              <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+              <text variable="collection-title" prefix=" " suffix="."/>
+              <group suffix=".">
+                <text macro="publisher" prefix=" "/>
+                <text variable="volume" prefix=" Vol "/>
+                <label variable="page" form="short" prefix=", " suffix=" " strip-periods="true"/>
+                <text variable="page" suffix="."/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group suffix=".">
+            <text macro="title" prefix=" "/>
+            <text macro="editor-translator" prefix=" "/>
+          </group>
+          <group prefix=" " suffix=".">
+            <text variable="container-title" form="short" font-style="italic"/>
+            <group prefix=" ">
+              <text variable="volume" font-weight="bold"/>
+            </group>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else>
       </choose>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/iso690-numeric-sk.csl b/iso690-numeric-sk.csl
index 5703ba9ba2..815e87c682 100644
--- a/iso690-numeric-sk.csl
+++ b/iso690-numeric-sk.csl
@@ -1,21 +1,21 @@
-<?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" default-locale="sk-SK" class="in-text">
-    <info>
-        <title>ISO-690 (numeric, Slovak)</title>
-        <id>http://www.zotero.org/styles/iso690-numeric-sk</id>
-        <link href="http://www.zotero.org/styles/iso690-numeric-sk" rel="self" />
-        <author>
-            <name>Tomáš (balrog) Bielčík</name>
-            <email>bx.balrog@gmail.com</email>
-        </author>
-        <category citation-format="numeric" />
-        <category field="generic-base" />
-        <updated>2012-03-08T18:56:30+00:00</updated>
-        <summary>ISO 690 style for the University of Economics in Bratislava, Slovakia.(Numeric version)</summary>
-        <link href="http://vili.uniba.sk/AK/citovanie_priklady.pdf" rel="documentation"/>
-        <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
-    </info>
-    <!-- ISO 690 sequence parts
+  <info>
+    <title>ISO-690 (numeric, Slovak)</title>
+    <id>http://www.zotero.org/styles/iso690-numeric-sk</id>
+    <link href="http://www.zotero.org/styles/iso690-numeric-sk" rel="self"/>
+    <author>
+      <name>Tomáš (balrog) Bielčík</name>
+      <email>bx.balrog@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="generic-base"/>
+    <updated>2012-03-08T18:56:30+00:00</updated>
+    <summary>ISO 690 style for the University of Economics in Bratislava, Slovakia.(Numeric version)</summary>
+    <link href="http://vili.uniba.sk/AK/citovanie_priklady.pdf" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <!-- ISO 690 sequence parts
     1. Primárna zodpovednosť
     2. Názov
     3. Druh nosiča
@@ -32,316 +32,290 @@
     14.Časť dokumentu
     15.Údaje o patentových dokumentoch
      -->
-    <locale>
-        <terms>
-            <term name="anonymous">Anon.</term>
-            <term name="no date">[no date]</term>
-            <term name="in">in</term>
-            <term name="online">online</term>
-            <term name="accessed">accessed</term>
-            <term name="retrieved">Available</term>
-            <term name="from">from</term>
-            <term name="page" form="short">
-                <single>p.</single>
-                <multiple>pp.</multiple>
-            </term>
-        </terms>
-    </locale>
-    <!-- macro block 
+  <locale>
+    <terms>
+      <term name="anonymous">Anon.</term>
+      <term name="no date">[no date]</term>
+      <term name="in">in</term>
+      <term name="online">online</term>
+      <term name="accessed">accessed</term>
+      <term name="retrieved">Available</term>
+      <term name="from">from</term>
+      <term name="page" form="short">
+        <single>p.</single>
+        <multiple>pp.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <!-- macro block 
      -->
-    <macro name="author">
-        <names variable="author" suffix=" ">
-            <name sort-separator=", " initialize-with="." name-as-sort-order="all" delimiter=" - " delimiter-precedes-last="always" et-al-min="3">
-                <name-part name="family" text-case="uppercase"/>
-                <name-part name="given" text-case="capitalize-first"/>
-            </name>
-            <label form="short" text-case="capitalize-first" suffix=". "/>
-            <substitute>
-                <names variable="editor"/>
-            </substitute>
-        </names>
-    </macro>
-    
-    <macro name="container_author">
-        <names variable="container-author" suffix=" ">
-            <name sort-separator=", " initialize-with="." name-as-sort-order="all" delimiter=" - " delimiter-precedes-last="always" et-al-min="3" >
-                <name-part name="family" text-case="uppercase"/>
-                <name-part name="given" text-case="capitalize-first"/>
-            </name>
-            <label form="short" text-case="capitalize-first" suffix=". "/>
-            <substitute>
-                <names variable="editor"/>
-            </substitute>
-        </names>
-    </macro>
-
-    
-    <macro name="title">
-        <group delimiter=" " suffix=". ">
-        <choose>
-            <if type="book thesis" match="any">
-                <text variable="title" font-style="italic" />
-            </if>
-            <else-if type="paper-conference chapter article-journal article-magazine article-newspaper webpage" match="any">
-                <text variable="title" suffix=". " />
-                <text term="in" text-case="capitalize-first" suffix=" " />
-                <text macro="container_author" />
-                <choose>
-                   <if variable="container-title">
-                      <text variable="container-title" font-style="italic" suffix=" " />
-                  </if>
-                  <else>
-                     <text variable="event" font-style="italic" suffix=" " />
-                  </else>
-               </choose>
-            </else-if>
-        </choose>
-        <text macro="publication_source" />
-        </group>        
-    </macro>
-    <macro name="publication_source">
-        <choose>
-        <if variable="URL">
-            <text term="online" prefix="[" suffix="]" />
+  <macro name="author">
+    <names variable="author" suffix=" ">
+      <name sort-separator=", " initialize-with="." name-as-sort-order="all" delimiter=" - " delimiter-precedes-last="always" et-al-min="3">
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given" text-case="capitalize-first"/>
+      </name>
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="container_author">
+    <names variable="container-author" suffix=" ">
+      <name sort-separator=", " initialize-with="." name-as-sort-order="all" delimiter=" - " delimiter-precedes-last="always" et-al-min="3">
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given" text-case="capitalize-first"/>
+      </name>
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <group delimiter=" " suffix=". ">
+      <choose>
+        <if type="book thesis" match="any">
+          <text variable="title" font-style="italic"/>
         </if>
-        </choose>
-    </macro>
-    <macro name="editor">
-        <names variable="editor">
-            <label form="short" text-case="capitalize-first" suffix=". "/>
-            <name and="text" delimiter=", "/>
-        </names>
-    </macro>
-    <macro name="series-editor">
-        <names variable="original-author">
-            <label form="short" text-case="capitalize-first" suffix=". "/>
-            <name and="text" delimiter=", "/>
-        </names>
-    </macro>
-   
-  
-    <macro name="author-short">
-        <names variable="author">
-            <name form="short" and="text" delimiter=", "/>
-            <substitute>
-                <names variable="editor"/>
-                <names variable="translator"/>
-                <text macro="anon"/>
-            </substitute>
-        </names>
-    </macro>
-    <macro name="time_data">
-        <group prefix=" [cit. " suffix="]. ">
-            <!--<text term="cited" text-case="lowercase" suffix=" "/>-->
-            <date variable="accessed">
-                <date-part name="year" suffix="-"/>
-                <date-part name="month" suffix="-" form="numeric-leading-zeros" />
-                <date-part name="day" form="numeric-leading-zeros" />
-            </date>
-        </group>
-    </macro>
-    <macro name="availability">
-        <choose>
-            <if variable="URL">
-                <text value="Dostupné na internete: "/>
-                <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-            </if>
-        </choose>
-    </macro>
-    
-      <macro name="publisher">
-        <group delimiter=": " >
-            <choose>
-                <if variable="publisher-place">
-                    <text variable="publisher-place" />
-                </if>
-                <else>
-                    <!-- sine loco (whithout place) -->
-                    <text value="[s.l.]" />
-                </else>
-            </choose>
-            <text variable="publisher"/>
-        </group>
-    </macro>
-    <macro name="ref-date">
-        <date variable="issued">
-            <date-part name="month" suffix=" "/>
-            <date-part name="year"/>
-        </date>
-    </macro>
-    <macro name="year-date">
-        <date variable="issued">
-            <date-part name="year" suffix=". "/>
-        </date>
-    </macro>
-    <macro name="date">
-        <date variable="issued">
-            <date-part name="year" suffix=". "/>
-        </date>
-    </macro>
-    <macro name="pages">
-        <choose>
-            <if type="book thesis" match="any">
-                <text variable="number-of-pages" suffix=" s." />
+        <else-if type="paper-conference chapter article-journal article-magazine article-newspaper webpage" match="any">
+          <text variable="title" suffix=". "/>
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <text macro="container_author"/>
+          <choose>
+            <if variable="container-title">
+              <text variable="container-title" font-style="italic" suffix=" "/>
             </if>
-            <else-if type="chapter paper-conference article-newspaper" match="any">
-                <text variable="page" prefix="s. " suffix=". "/>
-            </else-if>
-        </choose>
-    </macro>
-    
-    <macro name="day-month">
-        <date variable="issued">
-            <date-part name="month"/>
-            <date-part name="day" prefix=" "/>
-        </date>
-    </macro>
-    
-    
-    <macro name="archive">
-        <group delimiter=". ">
-            <text variable="archive_location" text-case="capitalize-first"/>
-            <text variable="archive"/>
-            <text variable="archive-place"/>
-        </group>
-    </macro>
-    
-    <macro name="notes">
-        <text variable="note" suffix=". " />
-    </macro>
-    
-    <macro name="edition">
-        <text variable="edition" suffix=". vyd." />
-    </macro>
-    
-    <macro name="publisher_block">
-        <group delimiter=", ">
+            <else>
+              <text variable="event" font-style="italic" suffix=" "/>
+            </else>
+          </choose>
+        </else-if>
+      </choose>
+      <text macro="publication_source"/>
+    </group>
+  </macro>
+  <macro name="publication_source">
+    <choose>
+      <if variable="URL">
+        <text term="online" prefix="[" suffix="]"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="time_data">
+    <group prefix=" [cit. " suffix="]. ">
+      <!--<text term="cited" text-case="lowercase" suffix=" "/>-->
+      <date variable="accessed">
+        <date-part name="year" suffix="-"/>
+        <date-part name="month" suffix="-" form="numeric-leading-zeros"/>
+        <date-part name="day" form="numeric-leading-zeros"/>
+      </date>
+    </group>
+  </macro>
+  <macro name="availability">
+    <choose>
+      <if variable="URL">
+        <text value="Dostupné na internete: "/>
+        <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <choose>
+        <if variable="publisher-place">
+          <text variable="publisher-place"/>
+        </if>
+        <else>
+          <!-- sine loco (whithout place) -->
+          <text value="[s.l.]"/>
+        </else>
+      </choose>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="ref-date">
+    <date variable="issued">
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year" suffix=". "/>
+    </date>
+  </macro>
+  <macro name="date">
+    <date variable="issued">
+      <date-part name="year" suffix=". "/>
+    </date>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="book thesis" match="any">
+        <text variable="number-of-pages" suffix=" s."/>
+      </if>
+      <else-if type="chapter paper-conference article-newspaper" match="any">
+        <text variable="page" prefix="s. " suffix=". "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="notes">
+    <text variable="note" suffix=". "/>
+  </macro>
+  <macro name="edition">
+    <text variable="edition" suffix=". vyd."/>
+  </macro>
+  <macro name="publisher_block">
+    <group delimiter=", ">
+      <text macro="publisher"/>
+      <text macro="year-date"/>
+    </group>
+  </macro>
+  <macro name="issue">
+    <group delimiter=", ">
+      <text variable="volume" prefix="Vol. "/>
+      <text variable="issue" prefix="no. "/>
+      <text variable="page" prefix="s. "/>
+    </group>
+  </macro>
+  <macro name="isbn">
+    <text prefix="ISBN " variable="ISBN"/>
+  </macro>
+  <!-- macro block end -->
+  <citation>
+    <sort>
+      <key variable="citation-number" sort="ascending"/>
+    </sort>
+    <layout vertical-align="sup" prefix="[" suffix="]" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number" prefix="[" suffix="]   "/>
+      <text macro="author" suffix=""/>
+      <choose>
+        <if type="book">
+          <group delimiter=" ">
+            <text macro="title" prefix=" " suffix="."/>
+            <text macro="edition"/>
+            <text macro="editor" suffix="."/>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="year-date"/>
+            </group>
+            <text macro="pages"/>
+            <text prefix="ISBN " variable="ISBN"/>
+          </group>
+        </if>
+        <else-if type="article-journal article-magazine" match="any">
+          <text macro="title"/>
+          <text macro="edition"/>
+          <text macro="date"/>
+          <text macro="issue" suffix=". "/>
+          <text macro="time_data" suffix=". "/>
+          <text macro="doi" suffix=". "/>
+          <text macro="availability"/>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text macro="title"/>
+          <text macro="edition"/>
+          <text macro="publisher_block"/>
+          <text macro="pages"/>
+          <text macro="time_data" suffix=". "/>
+          <text macro="availability"/>
+        </else-if>
+        <else-if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
+          <text macro="title"/>
+          <text macro="edition"/>
+          <text macro="publisher_block"/>
+          <text macro="pages"/>
+          <text macro="time_data"/>
+          <text macro="isbn"/>
+          <text macro="availability"/>
+        </else-if>
+        <else-if type="paper-conference">
+          <text macro="title"/>
+          <text macro="publisher_block"/>
+          <text macro="pages"/>
+          <text macro="time_data"/>
+          <text macro="availability"/>
+        </else-if>
+        <else-if type="thesis">
+          <text macro="title"/>
+          <text macro="publisher_block"/>
+          <text macro="time_data"/>
+          <text macro="availability"/>
+        </else-if>
+        <else-if type="patent">
+          <text macro="title"/>
+          <text macro="date"/>
+          <text variable="publisher-place"/>
+          <text macro="time_data"/>
+          <text macro="availability"/>
+        </else-if>
+        <else-if type="post-weblog post webpage" match="any">
+          <text macro="title"/>
+          <text macro="year-date"/>
+          <text macro="time_data"/>
+          <text macro="availability"/>
+        </else-if>
+        <else>
+          <group suffix=".">
+            <text macro="title" prefix=" "/>
+            <text macro="editor" prefix=" "/>
+          </group>
+          <group delimiter=", ">
             <text macro="publisher"/>
             <text macro="year-date"/>
-        </group>
-    </macro>
-    
-    <macro name="issue">
-        <group delimiter=", ">
-            <text variable="volume" prefix="Vol.&#xA0;" />
-            <text variable="issue" prefix="no.&#xA0;" />
-            <text variable="page" prefix="s.&#xA0;" />
-        </group>
-    </macro>
-    
-    <macro name="isbn">
-        <text prefix="ISBN " variable="ISBN" />
-    </macro>
-    
-    <!-- macro block end -->
-    
-    <citation>
-        <sort>	
-            <key variable="citation-number" sort="ascending"/>
-        </sort>
-        
-        <layout vertical-align="sup" prefix="[" suffix="]" delimiter=",">
-            <text variable="citation-number"/>
-        </layout>
-        
-    </citation>
-    <bibliography>
-        <sort>
-            <key macro="author"/>
-            <key variable="title"/>
-        </sort>
-        <layout suffix=".">
-            <text variable="citation-number" prefix="[" suffix="]   " />
-            <text macro="author" suffix=""/>
-            <choose>
-                <if type="book">
-                    <group delimiter=" ">
-                        <text macro="title" prefix=" " suffix="."/>
-                        <text macro="edition" />
-                        <text macro="editor" suffix="."/>
-                        <group delimiter=", ">
-                            <text macro="publisher"/>
-                            <text macro="year-date"/>
-                        </group>
-                        <text macro="pages" />
-                        <text prefix="ISBN " variable="ISBN" />
-                    </group>
-                </if>
-                <else-if type="article-journal article-magazine" match="any">
-                    <text macro="title" />
-                    <text macro="edition" />
-                    <text macro="date" />
-                    <text macro="issue" suffix=". "/>
-                    <text macro="time_data" suffix=". " />
-                    <text macro="doi" suffix=". "/>
-                    <text macro="availability" />
-                </else-if>
-                <else-if type="article-newspaper">
-                    <text macro="title" />
-                    <text macro="edition" />
-                    <text macro="publisher_block" />
-                    <text macro="pages" />
-                    <text macro="time_data" suffix=". " />
-                    <text macro="availability" /> 
-                </else-if>
-                
-                <else-if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
-                    <text macro="title" />
-                    <text macro="edition" />
-                    <text macro="publisher_block" />
-                    <text macro="pages" />
-                    <text macro="time_data" />
-                    <text macro="isbn" />
-                    <text macro="availability" />
-                </else-if>
-                
-                <else-if type="paper-conference">
-                    <text macro="title" />
-                    <text macro="publisher_block" />
-                    <text macro="pages" />
-                    <text macro="time_data" />
-                    <text macro="availability" />
-                </else-if>
-                
-                <else-if type="thesis">
-                    <text macro="title" />
-                    <text macro="publisher_block" />
-                    <text macro="time_data" />
-                    <text macro="availability" />
-                </else-if>
-                
-                <else-if type="patent">
-                    <text macro="title" />
-                    <text macro="date" />
-                    <text variable="publisher-place" />
-                    <text macro="time_data" />
-                    <text macro="availability" />
-                </else-if>
-                
-                <else-if type="post-weblog post webpage" match="any">
-                    <text macro="title" />
-                    <text macro="year-date" />
-                    <text macro="time_data" />
-                    <text macro="availability" />
-                </else-if>
-                
-                <else>
-                    <group suffix="." >
-                        <text macro="title" prefix=" " />
-                        <text macro="editor" prefix=" "/>
-                    </group>
-                    <group delimiter=", ">
-                        <text macro="publisher"/>
-                        <text macro="year-date"/>
-                    </group>
-                    <text macro="time_data" />
-                    <text macro="pages" />
-                    <text macro="notes" />
-                    <text macro="availability" />
-                </else>
-                
-            </choose>
-        </layout>
-    </bibliography>
-</style> 
-
+          </group>
+          <text macro="time_data"/>
+          <text macro="pages"/>
+          <text macro="notes"/>
+          <text macro="availability"/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/journal-of-chemical-ecology.csl b/journal-of-chemical-ecology.csl
index c06009dfcc..baf20ac8dd 100644
--- a/journal-of-chemical-ecology.csl
+++ b/journal-of-chemical-ecology.csl
@@ -25,7 +25,7 @@
       <if type="chapter paper-conference" match="any">
         <text term="in" suffix=" "/>
         <names variable="editor translator" delimiter=", ">
-          <name  and="text" sort-separator=", " initialize-with=". " delimiter=", " />
+          <name and="text" sort-separator=", " initialize-with=". " delimiter=", "/>
           <label form="short" prefix=" (" suffix=")."/>
         </names>
       </if>
@@ -36,7 +36,7 @@
       <if type="chapter paper-conference" match="none">
         <names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
           <name and="text" initialize-with=". " delimiter=", "/>
-          <label form="short" prefix=", " text-case="capitalize-first" />
+          <label form="short" prefix=", " text-case="capitalize-first"/>
         </names>
       </if>
     </choose>
@@ -63,10 +63,10 @@
         <names variable="translator"/>
         <choose>
           <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" form="short" />
+            <text variable="title" form="short"/>
           </if>
           <else>
-            <text variable="title" form="short" />
+            <text variable="title" form="short"/>
           </else>
         </choose>
       </substitute>
@@ -97,8 +97,8 @@
     <group delimiter=". ">
       <text variable="genre"/>
       <group delimiter=", ">
-	<text variable="publisher"/>
-	<text variable="publisher-place"/>
+        <text variable="publisher"/>
+        <text variable="publisher-place"/>
       </group>
     </group>
     <text variable="number-of-pages" prefix=". " suffix=" pp"/>
@@ -147,7 +147,7 @@
         <choose>
           <if is-numeric="edition">
             <number variable="edition" form="ordinal" prefix=", "/>
-            <text term="edition" form="long" prefix=" " />
+            <text term="edition" form="long" prefix=" "/>
           </if>
           <else>
             <text variable="edition" prefix=", " suffix=""/>
@@ -165,15 +165,15 @@
       </if>
       <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
         <group prefix=", " delimiter=", ">
-	  <group delimiter=" ">
-	    <label variable="page" form="short" />
-	    <text variable="page"/>
-	  </group>
-	  <group delimiter=" ">          
-	    <text macro="container-contributors"/>
-	    <text macro="secondary-contributors"/>
-	    <text variable="container-title" />
-	  </group>
+          <group delimiter=" ">
+            <label variable="page" form="short"/>
+            <text variable="page"/>
+          </group>
+          <group delimiter=" ">
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <text variable="container-title"/>
+          </group>
         </group>
       </else-if>
     </choose>
diff --git a/journal-of-evolutionary-biology.csl b/journal-of-evolutionary-biology.csl
index 84ebbeea2f..6489339f35 100644
--- a/journal-of-evolutionary-biology.csl
+++ b/journal-of-evolutionary-biology.csl
@@ -173,7 +173,7 @@
       <group delimiter=". ">
         <text macro="author"/>
         <text macro="year-date"/>
-		<text macro="title"/>
+        <text macro="title"/>
         <text macro="journal-location"/>
         <text macro="chapter-info"/>
         <text macro="publisher"/>
@@ -181,4 +181,4 @@
       </group>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/journal-of-psychiatry-and-neuroscience.csl b/journal-of-psychiatry-and-neuroscience.csl
index 212869b73b..6cc14f6a85 100644
--- a/journal-of-psychiatry-and-neuroscience.csl
+++ b/journal-of-psychiatry-and-neuroscience.csl
@@ -96,7 +96,7 @@
   <macro name="container-title">
     <choose>
       <if type="article-journal article-magazine chapter paper-conference article-newspaper" match="any">
-        <group  delimiter=" ">
+        <group delimiter=" ">
           <text variable="container-title" form="short" font-style="italic" strip-periods="true"/>
           <choose>
             <if variable="URL">
@@ -127,10 +127,10 @@
   <macro name="title">
     <choose>
       <if type="book report">
-	<text variable="title" font-style="italic"/>
+        <text variable="title" font-style="italic"/>
       </if>
       <else>
-	<text variable="title"/>
+        <text variable="title"/>
       </else>
     </choose>
     <choose>
diff --git a/macromolecular-reaction-engineering.csl b/macromolecular-reaction-engineering.csl
index 62f5cfb253..9a35d2c96b 100644
--- a/macromolecular-reaction-engineering.csl
+++ b/macromolecular-reaction-engineering.csl
@@ -53,7 +53,7 @@
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]" >
+    <layout vertical-align="sup" delimiter="," prefix="[" suffix="]">
       <text variable="citation-number"/>
     </layout>
   </citation>
diff --git a/molecular-ecology.csl b/molecular-ecology.csl
index 48d3a94791..15d899f971 100644
--- a/molecular-ecology.csl
+++ b/molecular-ecology.csl
@@ -1,151 +1,151 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" default-locale="en-US" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>Molecular Ecology</title>
-      <id>http://www.zotero.org/styles/molecular-ecology</id>
-      <link href="http://www.zotero.org/styles/molecular-ecology" rel="self"/>
-      <link href="http://www.zotero.org/styles/ecology-letters" rel="template"/>
-      <link href="http://www.wiley.com/bw/submit.asp?ref=0962-1083&amp;site=1" rel="documentation"/>
-      <author>
-         <name>Xiaodong Dang</name>
-         <email>dangxdong@gmail.com</email>
-      </author>
-      <contributor>
-         <name>Johan Asplund</name>
-         <email>asplundj@gmail.com</email>
-      </contributor>
-      <contributor>
-         <name>David Kaplan</name>
-         <email>david.kaplan@ird.fr</email>
-      </contributor>
-      <category citation-format="author-date"/>
-      <category field="biology"/>
-      <issn>1365-294X</issn>
-      <issn>0962-1083</issn>
-      <updated>2012-02-18T21:56:00+00:00</updated>
-      <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
-   </info>
-   <macro name="editor-translator">
-      <names variable="editor translator" prefix=" (" delimiter=", " suffix=")">
-         <name initialize-with="" delimiter=", "/>
-         <label form="short" prefix=", " text-case="capitalize-first" suffix="," strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", "/>
-	 <!--TO DO: add delimiter-precedes-et-al="never" with csl 1.0.1-->
-         <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
-         <et-al font-style="italic"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="title"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="author-short">
-      <names variable="author">
-         <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
-         <et-al font-style="italic"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <choose>
-               <if type="bill book graphic legal_case motion_picture report song" match="any">
-                  <text variable="title" form="short" font-style="italic"/>
-               </if>
-               <else>
-                  <text variable="title" form="short" quotes="true"/>
-               </else>
-            </choose>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-         </if>
-         <else>
-            <text variable="title"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=", ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
+  <info>
+    <title>Molecular Ecology</title>
+    <id>http://www.zotero.org/styles/molecular-ecology</id>
+    <link href="http://www.zotero.org/styles/molecular-ecology" rel="self"/>
+    <link href="http://www.zotero.org/styles/ecology-letters" rel="template"/>
+    <link href="http://www.wiley.com/bw/submit.asp?ref=0962-1083&amp;site=1" rel="documentation"/>
+    <author>
+      <name>Xiaodong Dang</name>
+      <email>dangxdong@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Johan Asplund</name>
+      <email>asplundj@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>David Kaplan</name>
+      <email>david.kaplan@ird.fr</email>
+    </contributor>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <issn>1365-294X</issn>
+    <issn>0962-1083</issn>
+    <updated>2012-02-18T21:56:00+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor-translator">
+    <names variable="editor translator" prefix=" (" delimiter=", " suffix=")">
+      <name initialize-with="" delimiter=", "/>
+      <label form="short" prefix=", " text-case="capitalize-first" suffix="," strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", "/>
+      <!--TO DO: add delimiter-precedes-et-al="never" with csl 1.0.1-->
+      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " initialize-with=". "/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="bill book graphic legal_case motion_picture report song" match="any">
+            <text variable="title" form="short" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation collapse="year-suffix" et-al-min="3" 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">
+    <sort>
+      <key variable="issued"/>
+      <key variable="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <group>
+          <label variable="locator" suffix="." form="short" strip-periods="true"/>
+          <text variable="locator" prefix=" "/>
+        </group>
       </group>
-   </macro>
-   <citation collapse="year-suffix" et-al-min="3" 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">
-      <sort>
-         <key variable="issued"/>
-         <key variable="author"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <group delimiter=" ">
-            <text macro="author-short"/>
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-            <group>
-               <label variable="locator" suffix="." form="short" strip-periods="true"/>
-               <text variable="locator" prefix=" "/>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="3" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author-short"/>
+      <key variable="issued"/>
+    </sort>
+    <layout>
+      <text macro="author" suffix=" "/>
+      <date variable="issued" prefix="(" suffix=")">
+        <date-part name="year"/>
+      </date>
+      <choose>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group suffix=".">
+            <text macro="title" prefix=" "/>
+            <text macro="editor-translator" prefix=" "/>
+          </group>
+          <text prefix=" " suffix="." macro="publisher"/>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" prefix=" "/>
+          <group prefix=".">
+            <group prefix=" In:" suffix="">
+              <text variable="container-title" font-style="italic" prefix=" " suffix=" "/>
+              <text variable="collection-title" prefix=" " suffix="."/>
+              <names variable="editor translator" prefix=" (" delimiter=", " suffix=")">
+                <label form="short" text-case="lowercase" suffix=" " strip-periods="true"/>
+                <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+              </names>
+              <group suffix=".">
+                <label variable="page" form="short" prefix=", " suffix=". " strip-periods="true"/>
+                <text variable="page" suffix=""/>
+                <text macro="publisher" prefix=". " suffix="."/>
+              </group>
             </group>
-         </group>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true"  et-al-min="6" et-al-use-first="3" entry-spacing="0" line-spacing="2">
-      <sort>
-         <key macro="author-short"/>
-         <key variable="issued"/>
-      </sort>
-      <layout>
-         <text macro="author" suffix=" "/>
-         <date variable="issued" prefix="(" suffix=")">
-            <date-part name="year"/>
-         </date>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <group suffix=".">
-                  <text macro="title" prefix=" "/>
-                  <text macro="editor-translator" prefix=" "/>
-               </group>
-               <text prefix=" " suffix="." macro="publisher"/>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <text macro="title" prefix=" "/>
-               <group prefix=".">
-                  <group prefix=" In:" suffix="">
-                     <text variable="container-title" font-style="italic" prefix=" " suffix=" "/>
-                     <text variable="collection-title" prefix=" " suffix="."/>
-                     <names variable="editor translator" prefix=" (" delimiter=", " suffix=")">
-                        <label form="short" text-case="lowercase" suffix=" " strip-periods="true"/>
-                        <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
-                     </names>
-                     <group suffix=".">
-                        <label variable="page" form="short" prefix=", " suffix=". " strip-periods="true"/>
-                        <text variable="page" suffix=""/>
-                        <text macro="publisher" prefix=". " suffix="."/>
-                     </group>
-                  </group>
-               </group>
-            </else-if>
-            <else>
-               <group suffix=".">
-                  <text macro="title" prefix=" "/>
-                  <text macro="editor-translator" prefix=" "/>
-               </group>
-               <group prefix=" " suffix=".">
-                  <text variable="container-title" font-style="italic"/>
-                  <group prefix=", ">
-                     <text variable="volume" font-weight="bold"/>
-                  </group>
-                  <text variable="page" prefix=", "/>
-               </group>
-            </else>
-         </choose>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+          </group>
+        </else-if>
+        <else>
+          <group suffix=".">
+            <text macro="title" prefix=" "/>
+            <text macro="editor-translator" prefix=" "/>
+          </group>
+          <group prefix=" " suffix=".">
+            <text variable="container-title" font-style="italic"/>
+            <group prefix=", ">
+              <text variable="volume" font-weight="bold"/>
+            </group>
+            <text variable="page" prefix=", "/>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/neuroscience-letters.csl b/neuroscience-letters.csl
index 9e88d5608a..7cda4577b4 100644
--- a/neuroscience-letters.csl
+++ b/neuroscience-letters.csl
@@ -38,7 +38,7 @@
   <macro name="editor">
     <names variable="editor">
       <name initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" text-case="capitalize-first" suffix=")" />
+      <label form="short" prefix=" (" text-case="capitalize-first" suffix=")"/>
     </names>
   </macro>
   <macro name="year-date">
@@ -103,7 +103,7 @@
           <text macro="edition" suffix=", "/>
           <text macro="publisher"/>
           <group delimiter=" ">
-            <label variable="page" form="short" prefix=": " />
+            <label variable="page" form="short" prefix=": "/>
             <text variable="page"/>
           </group>
         </else-if>
diff --git a/oscola.csl b/oscola.csl
index 5be86692ac..687b4f5080 100644
--- a/oscola.csl
+++ b/oscola.csl
@@ -6,9 +6,9 @@
     <link href="http://www.zotero.org/styles/oscola" rel="self"/>
     <link href="http://www.zotero.org/styles/chicago-fullnote-bibliography" rel="template"/>
     <author>
-        <name>Virgilio Afonso da Silva (University of Sao Paulo)</name>
-	<email>v a s  [at]  u s p  [dot]  b r</email>
-        <uri>www.law.usp.br/vas</uri>
+      <name>Virgilio Afonso da Silva (University of Sao Paulo)</name>
+      <email>v a s  [at]  u s p  [dot]  b r</email>
+      <uri>www.law.usp.br/vas</uri>
     </author>
     <category citation-format="note"/>
     <category field="law"/>
@@ -16,59 +16,55 @@
     <summary>A still incomplete style (handles only secondary sources) for the OSCOLA standards</summary>
     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
-
-<locale xml:lang="en-GB">
-<terms>
-    <term name="et-al">and others</term>
-    <term name="editor" form="short">
+  <locale xml:lang="en-GB">
+    <terms>
+      <term name="et-al">and others</term>
+      <term name="editor" form="short">
         <single>ed</single>
         <multiple>eds</multiple>
-    </term>
-    <term name="translator" form="short">
-	<single>tr</single>
-	<multiple>trs</multiple>
-    </term>
-    <term name="paragraph" form="short">
-	<single>para</single>
-	<multiple>paras</multiple>
-    </term>
-    <term name="open-quote">‘</term>
-    <term name="close-quote">’</term>
-</terms>
-</locale>
-
+      </term>
+      <term name="translator" form="short">
+        <single>tr</single>
+        <multiple>trs</multiple>
+      </term>
+      <term name="paragraph" form="short">
+        <single>para</single>
+        <multiple>paras</multiple>
+      </term>
+      <term name="open-quote">‘</term>
+      <term name="close-quote">’</term>
+    </terms>
+  </locale>
   <macro name="editor-translator">
     <group delimiter=", ">
       <choose>
         <if variable="author">
-      <names variable="editor" delimiter=", ">
-        <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
-        <label form="short" text-case="lowercase" prefix =" (" suffix=")"/>
-      </names>
-      <choose>
-        <if variable="container-author">
-      <group prefix=" by ">
-        <names variable="container-author">
-          <label form="verb-short" prefix=" " text-case="lowercase" suffix=" "/>
-          <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
-        </names>
-      </group>
-        </if>
-      </choose>
+          <names variable="editor" delimiter=", ">
+            <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
+            <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+          </names>
+          <choose>
+            <if variable="container-author">
+              <group prefix=" by ">
+                <names variable="container-author">
+                  <label form="verb-short" prefix=" " text-case="lowercase" suffix=" "/>
+                  <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
+                </names>
+              </group>
+            </if>
+          </choose>
         </if>
       </choose>
       <choose>
         <if variable="author editor" match="any">
-      <names variable="translator" delimiter=", ">
-        <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
-        <label form="short" text-case="lowercase" prefix=" " suffix=""/>
-      </names>
+          <names variable="translator" delimiter=", ">
+            <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
+            <label form="short" text-case="lowercase" prefix=" " suffix=""/>
+          </names>
         </if>
       </choose>
     </group>
   </macro>
-
-
   <macro name="secondary-contributors-note">
     <choose>
       <if type="chapter" match="none">
@@ -76,8 +72,6 @@
       </if>
     </choose>
   </macro>
-
-
   <macro name="container-contributors-note">
     <choose>
       <if type="chapter">
@@ -85,52 +79,40 @@
       </if>
     </choose>
   </macro>
-
-
   <macro name="editor-note">
     <names variable="editor">
       <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" sort-separator=", " delimiter=", "/>
       <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
-
-
   <macro name="translator-note">
     <names variable="translator">
       <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" sort-separator=", " delimiter=", "/>
       <label form="verb-short" prefix=", " suffix="."/>
     </names>
   </macro>
-
-
   <macro name="recipient-note">
     <names variable="recipient" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
     </names>
   </macro>
-
-
   <macro name="contributors-note">
     <names variable="author">
       <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" sort-separator=", " delimiter=", "/>
       <substitute>
-	<text macro="editor-note"/>
-	<text macro="translator-note"/>
+        <text macro="editor-note"/>
+        <text macro="translator-note"/>
       </substitute>
     </names>
     <text macro="recipient-note"/>
   </macro>
-
-
   <macro name="recipient-short">
     <names variable="recipient">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name form="short" and="text" delimiter=", "/>
     </names>
   </macro>
-
-
   <macro name="contributors-short">
     <names variable="author">
       <name form="short" and="text" delimiter=", "/>
@@ -141,16 +123,12 @@
     </names>
     <text macro="recipient-short"/>
   </macro>
-
-
   <macro name="interviewer-note">
     <names variable="interviewer" delimiter=", ">
       <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
       <name et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" and="text" delimiter=", "/>
     </names>
   </macro>
-
-
   <macro name="title-note">
     <choose>
       <if variable="title" match="none">
@@ -164,8 +142,6 @@
       </else>
     </choose>
   </macro>
-
-
   <macro name="title-short">
     <choose>
       <if variable="title" match="none">
@@ -189,8 +165,6 @@
       </else>
     </choose>
   </macro>
-
-
   <macro name="description-note">
     <group delimiter=", ">
       <text macro="interviewer-note"/>
@@ -204,76 +178,61 @@
       </choose>
     </group>
   </macro>
-
-
   <macro name="container-title-note">
     <choose>
       <if type="chapter">
-    <text term="in" text-case="lowercase" suffix=" "/>
+        <text term="in" text-case="lowercase" suffix=" "/>
       </if>
     </choose>
-  </macro> 
-
+  </macro>
   <macro name="container-title-chapter">
     <choose>
       <if type="chapter">
-         <text variable="container-title" font-style="italic"/>
+        <text variable="container-title" font-style="italic"/>
       </if>
     </choose>
-  </macro> 
-
+  </macro>
   <macro name="container-title-newspaper-magazine">
     <choose>
       <if type="article-newspaper article-magazine" match="any">
-         <text variable="container-title" font-style="italic" prefix=" "/>
+        <text variable="container-title" font-style="italic" prefix=" "/>
       </if>
     </choose>
-  </macro> 
-
-
+  </macro>
   <macro name="container-title-article">
     <choose>
       <if type="article-journal">
-         <text variable="container-title"/>
+        <text variable="container-title"/>
       </if>
     </choose>
-  </macro> 
-
-
-
+  </macro>
   <macro name="edition-note">
     <choose>
       <if type="book chapter" match="any">
-    <choose>
-      <if is-numeric="edition">
-          <number variable="edition" form="ordinal" suffix=" edn,"/>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
+        <choose>
+          <if is-numeric="edition">
+            <number variable="edition" form="ordinal" suffix=" edn,"/>
+          </if>
+          <else>
+            <text variable="edition" suffix="."/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
-
-
   <macro name="collection-title">
     <text variable="collection-title"/>
     <text variable="collection-number" prefix=" "/>
   </macro>
-
-
   <macro name="locators-note">
     <choose>
       <if type="article-journal">
         <text variable="volume"/>
       </if>
       <else-if type="legal_case">
-      </else-if> 
+      </else-if>
     </choose>
   </macro>
-
-
   <macro name="event">
     <group>
       <text term="presented at" suffix=" "/>
@@ -281,94 +240,84 @@
     </group>
   </macro>
   <macro name="publisher">
-      <text variable="publisher"/>
+    <text variable="publisher"/>
   </macro>
-
-
   <macro name="issued">
     <choose>
       <if variable="issued">
-    <choose>
-      <if type="graphic report" match="any">
-        <date variable="issued">
-          <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=" "/>
-          <date-part name="year"/>
-        </date>
-      </if>
-      <else-if type="book chapter thesis article-journal" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-      <else>
-        <date variable="issued">
-          <date-part name="day" suffix=" "/>
-          <date-part name="month" suffix=" "/>
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
+        <choose>
+          <if type="graphic report" match="any">
+            <date variable="issued">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </if>
+          <else-if type="book chapter thesis article-journal" match="any">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </else-if>
+          <else>
+            <date variable="issued">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </else>
+        </choose>
       </if>
       <else>
-    <text term="no date"/>
+        <text term="no date"/>
       </else>
     </choose>
   </macro>
-
-
   <macro name="pages">
     <choose>
       <if type="article-journal">
-    <text variable="page"/>
+        <text variable="page"/>
       </if>
     </choose>
   </macro>
-
-
   <macro name="first-page-article">
     <choose>
       <if type="article-journal">
-      <choose> 
-       <if variable="locator" match="any">
-         <text variable="page-first"/>
-       </if>
-      </choose>
+        <choose>
+          <if variable="locator" match="any">
+            <text variable="page-first"/>
+          </if>
+        </choose>
       </if>
     </choose>
   </macro>
-
-
   <macro name="point-locators-subsequent">
     <group>
       <choose>
-	<if type="legal_case">
-	  <label variable="locator" form="short" prefix=", "/>
-	</if> 
-	<else-if locator="page" match="none">
+        <if type="legal_case">
+          <label variable="locator" form="short" prefix=", "/>
+        </if>
+        <else-if locator="page" match="none">
           <choose>
-	    <if type="book">
+            <if type="book">
               <choose>
-	        <if variable="volume">
+                <if variable="volume">
                   <group>
                     <text term="volume" form="short" text-case="lowercase" prefix=" " suffix=". "/>
                     <number variable="volume" form="numeric"/>
-  	            <label variable="locator" form="short" prefix=", " suffix=" "/> 
+                    <label variable="locator" form="short" prefix=", " suffix=" "/>
                   </group>
-	        </if>
-	        <else>
-	          <label variable="locator" form="short" suffix=" "/>
-	        </else>
-	      </choose>
-	    </if>
-	  </choose>
-	</else-if>
+                </if>
+                <else>
+                  <label variable="locator" form="short" suffix=" "/>
+                </else>
+              </choose>
+            </if>
+          </choose>
+        </else-if>
       </choose>
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
-
-
   <macro name="point-locators">
     <choose>
       <if variable="locator" match="none">
@@ -379,19 +328,17 @@
       </else-if>
       <else-if type="legal_case"> </else-if>
       <else>
-    <group prefix=" ">
-      <choose>
-	    <if locator="page" match="none">
-	      <label variable="locator" form="short" suffix=" "/>
-	    </if>
-	  </choose>
-      <text variable="locator"/>
-	</group>
+        <group prefix=" ">
+          <choose>
+            <if locator="page" match="none">
+              <label variable="locator" form="short" suffix=" "/>
+            </if>
+          </choose>
+          <text variable="locator"/>
+        </group>
       </else>
     </choose>
   </macro>
-
-
   <macro name="archive-note">
     <group delimiter=", ">
       <text variable="archive_location"/>
@@ -399,49 +346,43 @@
       <text variable="archive-place"/>
     </group>
   </macro>
-
-  
   <macro name="book-volume-note">
     <choose>
       <if type="legal_case">
       </if>
       <else-if type="book chapter" match="any">
-	  <text variable="volume" prefix=", vol. "/>
+        <text variable="volume" prefix=", vol. "/>
       </else-if>
     </choose>
   </macro>
-
-
   <macro name="issue-note">
     <choose>
       <if type="article-journal">
-	<choose>
-	  <if variable="volume" match="none">
+        <choose>
+          <if variable="volume" match="none">
             <text macro="issued" prefix=" [" suffix="] "/>
-	  </if>
-	  <else>
+          </if>
+          <else>
             <text macro="issued" prefix=" (" suffix=") "/>
-	  </else>
-	</choose>
+          </else>
+        </choose>
       </if>
       <else-if type="article-newspaper article-magazine" match="any">
-	<choose>
-	  <if variable="publisher-place" match="none">
+        <choose>
+          <if variable="publisher-place" match="none">
             <text macro="issued" prefix=" (" suffix=")"/>
-	  </if>
-	  <else>
+          </if>
+          <else>
             <text variable="publisher-place" prefix=" (" suffix=", "/>
             <text macro="issued" suffix=")"/>
-	  </else>
-	</choose>
+          </else>
+        </choose>
       </else-if>
-
       <else-if type="webpage" match="any">
         <text variable="container-title" font-style="italic" prefix=" (" suffix=", "/>
         <text macro="issued" suffix=")"/>
-	<text macro="access-note" prefix=" "/>
+        <text macro="access-note" prefix=" "/>
       </else-if>
-
       <else-if variable="publisher" match="any">
         <group prefix=" (" suffix=")" delimiter=" ">
           <group delimiter=" ">
@@ -454,7 +395,7 @@
             <text macro="event"/>
           </group>
           <text macro="secondary-contributors-note" suffix=","/>
-	  <text macro="edition-note"/>
+          <text macro="edition-note"/>
           <text macro="publisher"/>
           <text macro="issued"/>
         </group>
@@ -465,143 +406,123 @@
       </else>
     </choose>
   </macro>
-
   <macro name="citing_legal_cases">
-   <choose>
-   <if type="legal_case">
-	<text variable="note" prefix=" [" suffix="]"/>
-	<text variable="number" prefix=", no. "/>
+    <choose>
+      <if type="legal_case">
+        <text variable="note" prefix=" [" suffix="]"/>
+        <text variable="number" prefix=", no. "/>
         <label variable="locator" form="short" prefix=", " suffix=" "/>
-	<text variable="locator"/>
-	<text variable="authority" prefix=", "/>
+        <text variable="locator"/>
+        <text variable="authority" prefix=", "/>
         <text variable="volume" prefix=" "/>
-    </if>
+      </if>
     </choose>
   </macro>
-
-
   <macro name="access-note">
     <group delimiter=", ">
       <choose>
-	<if type="graphic report" match="any">
+        <if type="graphic report" match="any">
           <text macro="archive-note"/>
-	</if>
-	<else-if type="book thesis chapter article-journal article-newspaper webpage article-magazine" match="none">
+        </if>
+        <else-if type="book thesis chapter article-journal article-newspaper webpage article-magazine" match="none">
           <text macro="archive-note"/>
-	</else-if>
-       </choose>
-       <choose>
-         <if type="legal_case" match="none">
-	   <group>
-	     <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-	       <date variable="accessed">
-	         <date-part name="day" prefix=" accessed " suffix=" "/>
-	         <date-part name="month" suffix=" "/>
-	         <date-part name="year"/>
-	       </date>
-	   </group>
-	 </if>
-       </choose>
+        </else-if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <group>
+            <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+            <date variable="accessed">
+              <date-part name="day" prefix=" accessed " suffix=" "/>
+              <date-part name="month" suffix=" "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </if>
+      </choose>
     </group>
   </macro>
-
-<!-- Bibliography only macros -->
-
+  <!-- Bibliography only macros -->
   <macro name="editor">
     <names variable="editor">
       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
       <label form="short" prefix=", " suffix="."/>
     </names>
   </macro>
-
   <macro name="translator">
     <names variable="translator">
       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
       <label form="verb-short" prefix=", " suffix="."/>
     </names>
   </macro>
-
-
   <macro name="contributors">
     <names variable="author">
       <name name-as-sort-order="first" and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always" et-al-min="11" et-al-use-first="7"/>
       <substitute>
-		<text macro="editor"/>
-		<text macro="translator"/>
+        <text macro="editor"/>
+        <text macro="translator"/>
       </substitute>
     </names>
     <text macro="recipient" prefix=". "/>
   </macro>
-
-
   <macro name="recipient">
     <choose>
       <if type="personal_communication">
-    	<choose>
-	  	  <if variable="genre">
-			<text variable="genre" text-case="capitalize-first"/>
-	  	  </if>
-	  	  <else>
-			<text term="letter" text-case="capitalize-first"/>
-		  </else>
-	    </choose>
-	  </if>
-	</choose>
-	<text macro="recipient-note" prefix=" "/>
-  </macro>
-
-
-
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+    <text macro="recipient-note" prefix=" "/>
+  </macro>
   <citation>
     <layout prefix="" suffix="" delimiter="; ">
       <choose>
-
         <if position="ibid-with-locator">
-          <group> 
+          <group>
             <text term="ibid" text-case="lowercase" suffix=""/>
             <text macro="point-locators-subsequent"/>
           </group>
         </if>
-
         <else-if position="ibid">
           <text term="ibid" text-case="lowercase" suffix=""/>
         </else-if>
-
         <else-if position="subsequent">
           <group>
             <text macro="contributors-short" suffix=", "/>
             <text macro="title-short" suffix=" "/>
-	    <text value="__" prefix="(n " suffix=")"/>
-            <text macro="point-locators-subsequent"/> 
+            <text value="__" prefix="(n " suffix=")"/>
+            <text macro="point-locators-subsequent"/>
           </group>
         </else-if>
-
         <else>
           <group>
             <text macro="contributors-note" suffix=", "/>
             <text macro="title-note"/>
-	    <text macro="citing_legal_cases"/>
+            <text macro="citing_legal_cases"/>
             <text macro="container-title-note" prefix=" "/>
-            <text macro="container-contributors-note" suffix=", "/> 
-            <text macro="container-title-chapter"/> 
-	    <text macro="container-title-newspaper-magazine"/>
-	    <text macro="book-volume-note"/> 
-            <text macro="issue-note"/> 
-            <text macro="locators-note" suffix=" "/> 
-            <text macro="container-title-article"/> 
+            <text macro="container-contributors-note" suffix=", "/>
+            <text macro="container-title-chapter"/>
+            <text macro="container-title-newspaper-magazine"/>
+            <text macro="book-volume-note"/>
+            <text macro="issue-note"/>
+            <text macro="locators-note" suffix=" "/>
+            <text macro="container-title-article"/>
             <text macro="description-note"/>
           </group>
-
-          <text macro="collection-title" prefix=", "/> 
-
+          <text macro="collection-title" prefix=", "/>
           <text macro="first-page-article" prefix=" "/>
           <text macro="point-locators"/>
-<!--          <text macro="access-note" prefix=" "/> -->
+          <!--          <text macro="access-note" prefix=" "/> -->
         </else>
       </choose>
     </layout>
   </citation>
-
   <bibliography hanging-indent="true" subsequent-author-substitute="——">
     <sort>
       <key macro="contributors"/>
@@ -609,22 +530,19 @@
     </sort>
     <layout suffix=".">
       <group>
-            <text macro="contributors" suffix=", "/>
-            <text macro="title-note"/>
-	    <text macro="citing_legal_cases"/>
-            <text macro="container-title-note" prefix=" "/>
-            <text macro="container-contributors-note" suffix=", "/> 
-            <text macro="container-title-chapter"/> 
-	    <text macro="container-title-newspaper-magazine"/>
-	    <text macro="book-volume-note"/> 
-            <text macro="issue-note"/> 
-            <text macro="locators-note" suffix=" "/> 
-            <text macro="container-title-article"/>
-            <text variable="page-first" prefix=", "/>
+        <text macro="contributors" suffix=", "/>
+        <text macro="title-note"/>
+        <text macro="citing_legal_cases"/>
+        <text macro="container-title-note" prefix=" "/>
+        <text macro="container-contributors-note" suffix=", "/>
+        <text macro="container-title-chapter"/>
+        <text macro="container-title-newspaper-magazine"/>
+        <text macro="book-volume-note"/>
+        <text macro="issue-note"/>
+        <text macro="locators-note" suffix=" "/>
+        <text macro="container-title-article"/>
+        <text variable="page-first" prefix=", "/>
       </group>
-
     </layout>
   </bibliography>
-
-
-</style>
\ No newline at end of file
+</style>
diff --git a/revista-brasileira-de-botanica.csl b/revista-brasileira-de-botanica.csl
index d79676b171..6aa572d70f 100644
--- a/revista-brasileira-de-botanica.csl
+++ b/revista-brasileira-de-botanica.csl
@@ -1,10 +1,10 @@
-<?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="in-text" default-locale="pt-BR">
   <info>
     <title>Revista Brasileira de Botânica (Brazilian Journal of Botany)</title>
     <id>http://www.zotero.org/styles/revista-brasileira-de-botanica</id>
     <link href="http://www.zotero.org/styles/revista-brasileira-de-botanica" rel="self"/>
-    <link href="http://www.scielo.br/revistas/rbb/iinstruc.htm" rel="documentation" />
+    <link href="http://www.scielo.br/revistas/rbb/iinstruc.htm" rel="documentation"/>
     <author>
       <name>Mario José</name>
       <email>gnumario [at-mark] gmail [dot-mark] com</email>
@@ -16,7 +16,7 @@
     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <locale xml:lang="pt-BR">
-    <terms> 
+    <terms>
       <term name="month-01" form="short">jan.</term>
       <term name="month-02" form="short">fev.</term>
       <term name="month-03" form="short">mar.</term>
@@ -29,7 +29,6 @@
       <term name="month-10" form="short">out.</term>
       <term name="month-11" form="short">nov.</term>
       <term name="month-12" form="short">dez.</term>
-      
       <term name="editor" form="short">
         <single>ed.</single>
         <multiple>eds.</multiple>
@@ -44,197 +43,180 @@
       </term>
     </terms>
   </locale>
-
   <macro name="container">
     <choose>
       <if type="chapter paper-conference" match="any">
-	<text value="In " font-style="italic"/>
-	<text variable="container-title" suffix=". "/>
-	<names variable="container-author" delimiter=", " prefix=" (" suffix=")">
-	  <name sort-separator=", " initialize-with="." delimiter=", "  delimiter-precedes-last="never" and="symbol">
-	    <name-part name="given" text-case="capitalize-first" />
-	    <name-part name="family" text-case="capitalize-first" />
-	  </name>
-	  <et-al prefix=" " font-style="italic"/>
-	  <label form="short" prefix=", " text-case="lowercase"/>
-	  <substitute>
-	    <names variable="editor"/>
-	    <names variable="collection-editor"/>
-	  </substitute>
-	</names>
+        <text value="In " font-style="italic"/>
+        <text variable="container-title" suffix=". "/>
+        <names variable="container-author" delimiter=", " prefix=" (" suffix=")">
+          <name sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+          <et-al prefix=" " font-style="italic"/>
+          <label form="short" prefix=", " text-case="lowercase"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="collection-editor"/>
+          </substitute>
+        </names>
       </if>
     </choose>
   </macro>
-
   <macro name="secondary-contributors">
     <choose>
       <if type="chapter" match="none">
-	<names variable="editor" delimiter=", " prefix=" (" suffix=")">
-	  <name and="symbol" initialize-with="." delimiter=", "/>
-	  <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
-	</names>
+        <names variable="editor" delimiter=", " prefix=" (" suffix=")">
+          <name and="symbol" initialize-with="." delimiter=", "/>
+          <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
+        </names>
       </if>
     </choose>
   </macro>
-
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol">
-	<name-part name="family" text-case="uppercase" />
-	<name-part name="given" text-case="uppercase" />
+        <name-part name="family" text-case="uppercase"/>
+        <name-part name="given" text-case="uppercase"/>
       </name>
       <et-al prefix=" " font-style="italic"/>
       <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first"/>
       <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="title"/>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
-
   <macro name="author-short">
     <names variable="author">
       <name form="short" name-as-sort-order="all" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="never" and="symbol">
-	<name-part name="family" text-case="capitalize-first" />
-	<name-part name="given" text-case="capitalize-first" />
+        <name-part name="family" text-case="capitalize-first"/>
+        <name-part name="given" text-case="capitalize-first"/>
       </name>
       <et-al prefix=" " font-style="italic"/>
       <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<choose>
-	  <if type="book">
-	    <text variable="title" form="short" />
-	  </if>
-	  <else>
-	    <text variable="title" form="short" quotes="true"/>
-	  </else>
-	</choose>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <choose>
+          <if type="book">
+            <text variable="title" form="short"/>
+          </if>
+          <else>
+            <text variable="title" form="short" quotes="true"/>
+          </else>
+        </choose>
       </substitute>
     </names>
   </macro>
-
   <macro name="access">
     <text variable="URL" prefix=" (" suffix=")."/>
-    <date variable="accessed" prefix="acesso em " >
+    <date variable="accessed" prefix="acesso em ">
       <date-part name="day" suffix="/"/>
-      <date-part name="month" suffix="/" />
+      <date-part name="month" suffix="/"/>
       <date-part name="year"/>
     </date>
   </macro>
-
   <macro name="title">
-    <text variable="title" text-case="capitalize-first" />
+    <text variable="title" text-case="capitalize-first"/>
   </macro>
-
   <macro name="container-title">
-    <text variable="container-title" />
+    <text variable="container-title"/>
   </macro>
-
   <macro name="publisher">
     <choose>
       <if match="any" variable="publisher-place publisher">
-	<group delimiter=", ">
-	  <choose>
-	    <if variable="publisher">
-	      <text variable="publisher"/>
-	    </if>
-	  </choose>
-	  <choose>
-	    <if variable="publisher-place">
-	      <text variable="publisher-place"/>
-	    </if>
-	  </choose>
-	</group>
+        <group delimiter=", ">
+          <choose>
+            <if variable="publisher">
+              <text variable="publisher"/>
+            </if>
+          </choose>
+          <choose>
+            <if variable="publisher-place">
+              <text variable="publisher-place"/>
+            </if>
+          </choose>
+        </group>
       </if>
     </choose>
   </macro>
-  
   <macro name="issued-year">
     <choose>
       <if variable="issued" match="any">
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
       </if>
     </choose>
   </macro>
-
   <macro name="edition">
     <choose>
       <if type="book chapter" match="any">
-	<choose>
-	  <if is-numeric="edition">
-	    <group delimiter=" ">
-	      <number variable="edition" form="ordinal" />
-	      <text term="edition" form="short" suffix="." prefix=" " />
-	    </group>
-	  </if>
-	  <else>
-	    <text variable="edition" suffix=" ed."/>
-	  </else>
-	</choose>
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" suffix="." prefix=" "/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" suffix=" ed."/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
-
   <macro name="locators">
     <choose>
       <if type="bill">
-	<group prefix=". " suffix="" delimiter=", ">
-	  <date variable="issued">
-	    <date-part name="day"/>
-	    <date-part prefix=" " name="month" form="short"/>
-	    <date-part prefix=" " name="year"/>
-	  </date>
-	  <text variable="section" prefix="Sec."/>
-	  <text variable="page" prefix="p." suffix="."/>
-	</group>
-      </if> 
+        <group prefix=". " suffix="" delimiter=", ">
+          <date variable="issued">
+            <date-part name="day"/>
+            <date-part prefix=" " name="month" form="short"/>
+            <date-part prefix=" " name="year"/>
+          </date>
+          <text variable="section" prefix="Sec."/>
+          <text variable="page" prefix="p." suffix="."/>
+        </group>
+      </if>
       <else-if match="any" type="article-journal article-magazine article-newspaper">
-	<group>
-	  <text variable="volume" />
-	  <text variable="issue" prefix="(" suffix=")"/>
-	  <text variable="page" prefix=":"/>
-	</group>
+        <group>
+          <text variable="volume"/>
+          <text variable="issue" prefix="(" suffix=")"/>
+          <text variable="page" prefix=":"/>
+        </group>
       </else-if>
       <else-if match="any" type="book chapter">
-	<group delimiter=", ">
-	  <text variable="volume" prefix="v." />
-	  <text variable="page" prefix="p."/>
-	</group>
+        <group delimiter=", ">
+          <text variable="volume" prefix="v."/>
+          <text variable="page" prefix="p."/>
+        </group>
       </else-if>
     </choose>
   </macro>
-
   <macro name="citation-locator">
     <group>
       <label variable="locator" form="short"/>
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
-
   <macro name="genre">
     <text variable="genre"/>
   </macro>
-
-  <citation et-al-min="3" 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">
+  <citation et-al-min="3" 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">
     <sort>
       <key macro="author"/>
       <key variable="issued"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter=", ">
       <group>
-	<text suffix = " " macro="author-short"/>
-	<text macro="issued-year"/>
-	<text prefix =", " macro="citation-locator"/>
+        <text suffix=" " macro="author-short"/>
+        <text macro="issued-year"/>
+        <text prefix=", " macro="citation-locator"/>
       </group>
     </layout>
   </citation>
-
   <bibliography hanging-indent="false" et-al-min="0" et-al-use-first="3" entry-spacing="0">
     <sort>
       <key macro="author"/>
@@ -242,84 +224,84 @@
     </sort>
     <layout>
       <choose>
-	<if type="bill">
-	  <text macro="author" suffix=". "/>
-	  <text variable="number" suffix=". "/>
-	  <text macro="title" suffix=". "/>
-	  <!-- use field 'history' to publisher -->
-	  <text variable="references" suffix=", " />
-	  <!-- use field 'extra' place -->
-	  <text variable="note" />
-	  <text macro="locators" suffix=". " />
-	</if>
-	<else-if type="map">
-	  <text macro="author" suffix=". "/>
-	  <text macro="issued-year" suffix=". "/>
-	  <group suffix=". " delimiter=", ">
-	    <text macro="title" />
-	    <text variable="note" />
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <text macro="author" suffix=". "/>
-	  <text macro="issued-year" suffix=". "/>
-	  <text macro="title" suffix=". "/>
-	  <group suffix=". " delimiter=", ">
-	    <text macro="edition" />
-	    <text macro="publisher" />
-	    <text macro="locators" />
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <!-- paper in conference too -->
-	  <text macro="author" suffix=". "/>
-	  <text macro="issued-year" suffix=". "/>
-	  <text macro="title" suffix=". "/>
-	  <text macro="container" suffix=". "/>
-	  <text macro="secondary-contributors" suffix=". "/>
-	  <text variable="collection-title" suffix=". "/>
-	  <group suffix=". " delimiter=", ">
-	    <text macro="edition" />
-	    <text macro="publisher" />
-	    <text macro="locators" />
-	  </group>
-	</else-if>
-	<else-if type="article-newspaper article-magazine article-journal" match="any">
-	  <text macro="author" suffix=". "/>
-	  <text macro="issued-year" suffix=". "/>
-	  <text macro="title" suffix=". "/>
-	  <text macro="container-title" suffix=" "/>
-	  <text variable="collection-title"  suffix=". " />
-	  <group suffix=". " delimiter=", ">
-	    <text macro="edition" />
-	    <text macro="locators" />
-	  </group>
-	</else-if>
-	<else-if type="thesis">
-	  <text macro="author" suffix=". "/>
-	  <text macro="issued-year" suffix=". "/>
-	  <text macro="title" suffix=". "/>
-	  <text macro="edition" suffix=", "/>
-	  <text macro="publisher" suffix=". "/>
-	</else-if>
-	<else-if type="webpage">
-	  <text macro="author" suffix=". "/>
-	  <text macro="title" suffix=". "/>
-	  <text macro="genre"/>
-	  <text macro="access" suffix=". "/>
-	</else-if> 
-	<else>
-	  <text macro="author" suffix=". "/>
-	  <text macro="issued-year" suffix=". "/>
-	  <text macro="title" suffix=". "/>
-	  <text macro="container"/>
-	  <text macro="secondary-contributors"/>
-	  <text macro="container-title"/>
-	  <text variable="collection-title" prefix=", " suffix="."/>
-	  <text macro="publisher" suffix=","/>
-	  <text macro="locators" suffix="."/>
-	  <text macro="access" suffix="."/>
-	</else>
+        <if type="bill">
+          <text macro="author" suffix=". "/>
+          <text variable="number" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <!-- use field 'history' to publisher -->
+          <text variable="references" suffix=", "/>
+          <!-- use field 'extra' place -->
+          <text variable="note"/>
+          <text macro="locators" suffix=". "/>
+        </if>
+        <else-if type="map">
+          <text macro="author" suffix=". "/>
+          <text macro="issued-year" suffix=". "/>
+          <group suffix=". " delimiter=", ">
+            <text macro="title"/>
+            <text variable="note"/>
+          </group>
+        </else-if>
+        <else-if type="book">
+          <text macro="author" suffix=". "/>
+          <text macro="issued-year" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <group suffix=". " delimiter=", ">
+            <text macro="edition"/>
+            <text macro="publisher"/>
+            <text macro="locators"/>
+          </group>
+        </else-if>
+        <else-if type="chapter">
+          <!-- paper in conference too -->
+          <text macro="author" suffix=". "/>
+          <text macro="issued-year" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="container" suffix=". "/>
+          <text macro="secondary-contributors" suffix=". "/>
+          <text variable="collection-title" suffix=". "/>
+          <group suffix=". " delimiter=", ">
+            <text macro="edition"/>
+            <text macro="publisher"/>
+            <text macro="locators"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper article-magazine article-journal" match="any">
+          <text macro="author" suffix=". "/>
+          <text macro="issued-year" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="container-title" suffix=" "/>
+          <text variable="collection-title" suffix=". "/>
+          <group suffix=". " delimiter=", ">
+            <text macro="edition"/>
+            <text macro="locators"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <text macro="author" suffix=". "/>
+          <text macro="issued-year" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="edition" suffix=", "/>
+          <text macro="publisher" suffix=". "/>
+        </else-if>
+        <else-if type="webpage">
+          <text macro="author" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="genre"/>
+          <text macro="access" suffix=". "/>
+        </else-if>
+        <else>
+          <text macro="author" suffix=". "/>
+          <text macro="issued-year" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="container"/>
+          <text macro="secondary-contributors"/>
+          <text macro="container-title"/>
+          <text variable="collection-title" prefix=", " suffix="."/>
+          <text macro="publisher" suffix=","/>
+          <text macro="locators" suffix="."/>
+          <text macro="access" suffix="."/>
+        </else>
       </choose>
     </layout>
   </bibliography>
diff --git a/sbl-fullnote-bibliography.csl b/sbl-fullnote-bibliography.csl
index 60519c7bc7..390e473e5f 100644
--- a/sbl-fullnote-bibliography.csl
+++ b/sbl-fullnote-bibliography.csl
@@ -525,15 +525,15 @@
         <else-if variable="volume">
           <choose>
             <if type="chapter paper-conference" match="any">
-	      <choose>
-		<if position="subsequent">             
-		  <group delimiter=" " suffix=", ">
-		    <text term="in" text-case="lowercase"/>
-		    <text variable="container-title" font-style="italic"/>
-		    <text macro="container-contributors-short" prefix="(" suffix=")"/>
-		  </group>
-		</if>
-	      </choose>
+              <choose>
+                <if position="subsequent">
+                  <group delimiter=" " suffix=", ">
+                    <text term="in" text-case="lowercase"/>
+                    <text variable="container-title" font-style="italic"/>
+                    <text macro="container-contributors-short" prefix="(" suffix=")"/>
+                  </group>
+                </if>
+              </choose>
               <number variable="volume" form="numeric" suffix=":"/>
             </if>
           </choose>
diff --git a/taylor-and-francis-harvard-x.csl b/taylor-and-francis-harvard-x.csl
index 2ef956943c..e2501487a9 100644
--- a/taylor-and-francis-harvard-x.csl
+++ b/taylor-and-francis-harvard-x.csl
@@ -219,10 +219,10 @@
     </sort>
     <layout prefix="(" suffix=")" delimiter=", ">
       <group delimiter=", ">
-	<group delimiter=" ">
-        <text macro="author-short"/>
-        <text macro="issued"/>
-	</group>
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="issued"/>
+        </group>
         <group delimiter=" ">
           <label variable="locator" form="short"/>
           <text variable="locator"/>
diff --git a/toxicon.csl b/toxicon.csl
index f13dec4427..2044dfc400 100644
--- a/toxicon.csl
+++ b/toxicon.csl
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
   <info>
     <title>Toxicon</title>
@@ -222,4 +222,4 @@
       <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/unctad-english.csl b/unctad-english.csl
index ff2b618d25..04accf95a8 100644
--- a/unctad-english.csl
+++ b/unctad-english.csl
@@ -27,80 +27,74 @@
       <term name="no date" form="short">n/d</term>
     </terms>
   </locale>
-  
   <!-- START MACROS -->
-  
   <macro name="author">
     <choose>
       <if type="article-magazine article-newspaper" match="any">
-	<text variable="container-title" font-style="italic"/>
+        <text variable="container-title" font-style="italic"/>
       </if>
       <else-if type="webpage">
-	<text variable="title"/>
+        <text variable="title"/>
       </else-if>
       <else>
-	<names variable="author">
-	  <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
-	  <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
-	  <substitute>
-	    <names variable="editor"/>
-	    <names variable="translator"/>
-	    <text variable="publisher"/>
-	  </substitute>
-	</names>
+        <names variable="author">
+          <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+          <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text variable="publisher"/>
+          </substitute>
+        </names>
       </else>
     </choose>
   </macro>
-  
   <macro name="author-short">
     <choose>
       <if type="article-magazine article-newspaper" match="any">
-	<text variable="container-title" font-style="italic"/>
+        <text variable="container-title" font-style="italic"/>
       </if>
       <else-if type="webpage">
-	<text variable="title"/>
+        <text variable="title"/>
       </else-if>
       <else>
-	<names variable="author">
-	  <name form="short" and="text" delimiter=", " initialize-with=". " delimiter-precedes-last="never"/>
-	  <substitute>
-	    <names variable="editor"/>
-	    <names variable="translator"/>
-	    <text variable="publisher"/>
-	  </substitute>
-	</names>
+        <names variable="author">
+          <name form="short" and="text" delimiter=", " initialize-with=". " delimiter-precedes-last="never"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text variable="publisher"/>
+          </substitute>
+        </names>
       </else>
     </choose>
   </macro>
-  
   <macro name="editor">
     <names variable="editor" delimiter=", ">
       <name name-as-sort-order="all" sort-separator=" " initialize-with=" " and="text" prefix="In: " suffix="," delimiter=", "/>
       <label form="short" text-case="lowercase" prefix=" " suffix="" strip-periods="true"/>
     </names>
   </macro>
-  
   <macro name="publisher">
     <choose>
       <if type="article-journal">
-	<text variable="publisher" font-style="italic"/>
+        <text variable="publisher" font-style="italic"/>
       </if>
       <else>
-	<choose>
-	  <if variable="call-number">
-	    <text variable="publisher-place"/>
-	  </if>
-	  <else>
-	    <group delimiter=". ">
-	      <text variable="publisher" />
-	      <text variable="publisher-place"/>
-	    </group>
-	  </else>
-	</choose>
+        <choose>
+          <if variable="call-number">
+            <text variable="publisher-place"/>
+          </if>
+          <else>
+            <group delimiter=". ">
+              <text variable="publisher"/>
+              <text variable="publisher-place"/>
+            </group>
+          </else>
+        </choose>
       </else>
     </choose>
   </macro>
-  
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case motion_picture song" match="any">
@@ -111,83 +105,79 @@
       </else>
     </choose>
   </macro>
-  
   <macro name="access-date">
     <choose>
       <if type="webpage">
-	<text value="Available at" prefix=" " suffix=":"/>
-	<text variable="URL" prefix=" " suffix="" font-style="normal"/>
-	<group prefix=" " delimiter=" ">
-	  <group prefix="(" suffix=")">
-	    <text term="accessed" suffix=": "/>
-	    <date variable="accessed">
-	      <date-part name="day" suffix=" "/>
-	      <date-part name="month" suffix=", "/>
-	      <date-part name="year"/>
-	    </date>
-	  </group>
-	</group>
+        <text value="Available at" prefix=" " suffix=":"/>
+        <text variable="URL" prefix=" " suffix="" font-style="normal"/>
+        <group prefix=" " delimiter=" ">
+          <group prefix="(" suffix=")">
+            <text term="accessed" suffix=": "/>
+            <date variable="accessed">
+              <date-part name="day" suffix=" "/>
+              <date-part name="month" suffix=", "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
       </if>
       <else-if type="article-magazine article-newspaper" match="any">
-	<date variable="issued" prefix=" ">
-	  <date-part name="day" suffix=" "/>
-	  <date-part name="month"/>
-	</date>
+        <date variable="issued" prefix=" ">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month"/>
+        </date>
       </else-if>
       <else-if type="report">
-	<date variable="issued" prefix=" ">
-	  <date-part name="month"/>
-	</date>
+        <date variable="issued" prefix=" ">
+          <date-part name="month"/>
+        </date>
       </else-if>
       <else>
-	<date variable="issued">
-	  <date-part name="day" prefix=" "/>
-	  <date-part name="month" prefix=" "/>
-	</date>
+        <date variable="issued">
+          <date-part name="day" prefix=" "/>
+          <date-part name="month" prefix=" "/>
+        </date>
       </else>
     </choose>
   </macro>
-  
   <macro name="year-date">
     <choose>
       <if variable="issued">
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
       </if>
       <else>
-	<choose>
-	  <if type="webpage">
-	    <choose>
-	      <if variable="accessed">
-		<date variable="accessed">
-		  <date-part name="year"/>
-		</date>
-	      </if>
-	      <else>
-		<text term="no date" form="short"/>
-	      </else>
-	    </choose>
-	  </if>
-	  <else>
-	    <text term="no date" form="short"/>
-	  </else>
-	</choose>
+        <choose>
+          <if type="webpage">
+            <choose>
+              <if variable="accessed">
+                <date variable="accessed">
+                  <date-part name="year"/>
+                </date>
+              </if>
+              <else>
+                <text term="no date" form="short"/>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text term="no date" form="short"/>
+          </else>
+        </choose>
       </else>
     </choose>
   </macro>
-  
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
-	<number variable="edition" prefix=" " form="long-ordinal"/>
+        <number variable="edition" prefix=" " form="long-ordinal"/>
       </if>
       <else>
         <text variable="edition" suffix="."/>
       </else>
     </choose>
   </macro>
-  
   <macro name="extra">
     <choose>
       <if variable="note">
@@ -195,15 +185,13 @@
       </if>
     </choose>
   </macro>
-  
   <macro name="un-sales">
     <choose>
       <if variable="call-number">
-	<text variable="call-number" prefix="United Nations publication. Sales No. "/>
+        <text variable="call-number" prefix="United Nations publication. Sales No. "/>
       </if>
     </choose>
   </macro>
-  
   <macro name="locators">
     <choose>
       <if type="article-journal">
@@ -228,31 +216,24 @@
       </else-if>
     </choose>
   </macro>
-  
   <macro name="citation-locator">
     <group>
       <text variable="locator" prefix=": "/>
     </group>
   </macro>
-
   <!-- END MACROS -->
-  
   <!-- STARTS CITATION -->
-
   <citation et-al-min="3" 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">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-	<text macro="author-short"/>
-	<text macro="year-date"/>
+        <text macro="author-short"/>
+        <text macro="year-date"/>
       </group>
       <text macro="citation-locator"/>
     </layout>
   </citation>
-  
   <!-- ENDS CITATION -->
-  
   <!-- STARTS BIBLIOGRAPHY -->
-
   <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="1" entry-spacing="1">
     <sort>
       <key macro="author"/>
@@ -263,46 +244,46 @@
       <text macro="year-date" prefix="(" suffix=")."/>
       <!-- Specific Formats -->
       <choose>
-	<if type="report">
+        <if type="report">
           <text macro="title" prefix=" " suffix=""/>
           <group prefix=". " delimiter=", ">
             <text variable="collection-title"/>
             <text macro="locators"/>
           </group>
           <group prefix=". " delimiter=", ">
-	    <text macro="un-sales"/>
+            <text macro="un-sales"/>
             <text macro="publisher"/>
             <text variable="page" prefix=" "/>
           </group>
-	  <text macro="access-date" prefix="."/>
+          <text macro="access-date" prefix="."/>
         </if>
         <else-if type="bill book graphic legal_case motion_picture song" match="any">
-	  <text macro="title" prefix=" "/>
-	  <choose>
-	    <if variable="collection-title" >
-	      <text variable="collection-title" prefix=". "/>
-	      <text macro="locators" prefix=", "/>
-	    </if>
-	  </choose>
-	  <group prefix=". " delimiter=". ">
-	    <text macro="un-sales" prefix=""/>
-	    <text macro="publisher"/>
-	  </group>
+          <text macro="title" prefix=" "/>
+          <choose>
+            <if variable="collection-title">
+              <text variable="collection-title" prefix=". "/>
+              <text macro="locators" prefix=", "/>
+            </if>
+          </choose>
+          <group prefix=". " delimiter=". ">
+            <text macro="un-sales" prefix=""/>
+            <text macro="publisher"/>
+          </group>
         </else-if>
-	<else-if type="chapter paper-conference" match="any">
+        <else-if type="chapter paper-conference" match="any">
           <text macro="title" prefix=" "/>
           <group prefix=". " delimiter="">
             <text macro="editor" suffix=". "/>
             <text variable="container-title" suffix=". " font-style="italic"/>
             <text variable="collection-title"/>
             <text macro="un-sales" prefix=". "/>
-            <text variable="publisher"/>            
-            <text variable="page" prefix=": "/>	
-	    <text variable="publisher-place" prefix=". " />
-	  </group>
+            <text variable="publisher"/>
+            <text variable="page" prefix=": "/>
+            <text variable="publisher-place" prefix=". "/>
+          </group>
         </else-if>
-        <else-if type="article-journal"> 
-          <text macro="title"  prefix=" " />
+        <else-if type="article-journal">
+          <text macro="title" prefix=" "/>
           <group prefix=". " delimiter=". ">
             <text variable="container-title" font-style="italic"/>
             <text variable="collection-title"/>
@@ -313,51 +294,48 @@
             <text variable="publisher"/>
           </group>
         </else-if>
-	<else-if type="article-magazine article-newspaper" match="any">
+        <else-if type="article-magazine article-newspaper" match="any">
           <group>
-            <text macro="title"  prefix=" " />
+            <text macro="title" prefix=" "/>
           </group>
           <group prefix=". " delimiter=". ">
-	    <names variable="author">
-	      <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
-	      <label form="short" prefix="," suffix="." text-case="lowercase" strip-periods="true"/>
-	      <substitute>
-		<names variable="editor"/>
-		<names variable="translator"/>
-	      </substitute>
-	    </names>
+            <names variable="author">
+              <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+              <label form="short" prefix="," suffix="." text-case="lowercase" strip-periods="true"/>
+              <substitute>
+                <names variable="editor"/>
+                <names variable="translator"/>
+              </substitute>
+            </names>
           </group>
-	  <text macro="access-date" prefix="."/>
+          <text macro="access-date" prefix="."/>
         </else-if>
         <else-if type="speech">
           <text macro="title" prefix=" "/>
           <text variable="event" prefix=". Presented at "/>
-	  <text macro="extra"/>
+          <text macro="extra"/>
           <text variable="publisher-place" prefix=". "/>
           <text macro="access-date" prefix=". "/>
           <text variable="URL" prefix=". Available at: " suffix="" font-style="normal"/>
         </else-if>
-	<else-if type="webpage">
-	  <names variable="author" prefix=" ">
-	    <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
-	    <label form="short" prefix="," suffix="." text-case="lowercase" strip-periods="true"/>
-	  </names>
-	  <text macro="access-date" prefix="."/>
+        <else-if type="webpage">
+          <names variable="author" prefix=" ">
+            <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="never"/>
+            <label form="short" prefix="," suffix="." text-case="lowercase" strip-periods="true"/>
+          </names>
+          <text macro="access-date" prefix="."/>
         </else-if>
         <else>
           <group delimiter=". ">
             <text macro="title" prefix=" "/>
             <text macro="editor"/>
             <text macro="extra"/>
-	    <text macro="access-date"/>
-	    <text variable="URL" prefix="Available at: " suffix="" font-style="normal"/>
+            <text macro="access-date"/>
+            <text variable="URL" prefix="Available at: " suffix="" font-style="normal"/>
           </group>
         </else>
-	
       </choose>
     </layout>
   </bibliography>
-  
   <!-- ENDS BIBLIOGRAPHY -->
-
-</style>
\ No newline at end of file
+</style>
diff --git a/wheaton-college-phd-in-biblical-and-theological-studies.csl b/wheaton-college-phd-in-biblical-and-theological-studies.csl
index 732731a04c..3b9c258342 100644
--- a/wheaton-college-phd-in-biblical-and-theological-studies.csl
+++ b/wheaton-college-phd-in-biblical-and-theological-studies.csl
@@ -675,7 +675,7 @@
       </else-if>
       <else-if type="paper-conference">
         <group prefix=" " delimiter=", ">
-	  <text variable="event" text-case="capitalize-first"/>
+          <text variable="event" text-case="capitalize-first"/>
           <text macro="publisher" text-case="capitalize-first"/>
           <text macro="issued"/>
         </group>
@@ -792,10 +792,10 @@
       </group>
       <text macro="locators"/>
       <text macro="collection-title" prefix=". "/>
-      <text macro="issue" />
+      <text macro="issue"/>
       <text macro="locators-newspaper" prefix=", "/>
       <text macro="locators-journal"/>
       <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/zeitschrift-fur-medienwissenschaft.csl b/zeitschrift-fur-medienwissenschaft.csl
index 8a9f8cadb7..70db1a4d9b 100644
--- a/zeitschrift-fur-medienwissenschaft.csl
+++ b/zeitschrift-fur-medienwissenschaft.csl
@@ -1,91 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style
-    xmlns="http://purl.org/net/xbiblio/csl"
-    version="1.0"
-    class="note"
-    default-locale="de-DE"
-    demote-non-dropping-particle="sort-only">
-
-<!--
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" default-locale="de-DE" demote-non-dropping-particle="sort-only">
+  <!--
 ================================================================================
    KOPFTEIL
 ================================================================================
 -->
-
-<info>
-  <title>Zeitschrift für Medienwissenschaft (German)</title>
-  <id>http://www.zotero.org/styles/zeitschrift-fur-medienwissenschaft</id>
-  <author>
-    <name>Till A. Heilmann</name>
-    <email>mail@tillheilmann.info</email>
-    <uri>http://www.tillheilmann.info</uri>
-  </author>
-  <link href="http://www.zotero.org/styles/zeitschrift-fur-medienwissenschaft" rel="self"/>
-  <link href="http://zfmedienwissenschaft.de/index.php?NID=24" rel="documentation"/>
-  <category citation-format="note"/>
-  <category field="humanities"/>
-  <issn>1869-1722</issn>
-  <updated>2012-02-07T01:46:04+00:00</updated>
-  <summary>Style for zfm. Zeitschrift für Medienwissenschaft. Citations in notes; no bibliography.</summary>
-  <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
-</info>
-
-<!--
+  <info>
+    <title>Zeitschrift für Medienwissenschaft (German)</title>
+    <id>http://www.zotero.org/styles/zeitschrift-fur-medienwissenschaft</id>
+    <author>
+      <name>Till A. Heilmann</name>
+      <email>mail@tillheilmann.info</email>
+      <uri>http://www.tillheilmann.info</uri>
+    </author>
+    <link href="http://www.zotero.org/styles/zeitschrift-fur-medienwissenschaft" rel="self"/>
+    <link href="http://zfmedienwissenschaft.de/index.php?NID=24" rel="documentation"/>
+    <category citation-format="note"/>
+    <category field="humanities"/>
+    <issn>1869-1722</issn>
+    <updated>2012-02-07T01:46:04+00:00</updated>
+    <summary>Style for zfm. Zeitschrift für Medienwissenschaft. Citations in notes; no bibliography.</summary>
+    <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <!--
 ================================================================================
    TODO
 ================================================================================
 -->
-
-<!--
+  <!--
 ================================================================================
    TERMS
 ================================================================================
 -->
-
-<locale xml:lang="de">
-  <terms>
-    <term name="accessed">gesehen am</term>
-    <term name="editor" form="short">
-      <single>Hg</single>
-      <multiple>Hg</multiple>
-    </term>
-    <term name="editor" form="verb-short">
-      <single>Hg. v</single>
-      <multiple>Hg. v</multiple>
-    </term>
-    <term name="translator" form="short">
-      <single>Übers</single>
-      <multiple>Übers</multiple>
-    </term>
-    <term name="translator" form="verb-short">
-      <single>Übers. v</single>
-      <multiple>Übers. v</multiple>
-    </term>
-    <term name="accessed">gesehen am</term>
-    <term name="ordinal-01">.</term>
-    <term name="ordinal-02">.</term>
-    <term name="ordinal-03">.</term>
-    <term name="ordinal-04">.</term>
-    <term name="long-ordinal-01">erste</term>
-    <term name="long-ordinal-02">zweite</term>
-    <term name="long-ordinal-03">dritte</term>
-    <term name="long-ordinal-04">vierte</term>
-    <term name="long-ordinal-05">fünfte</term>
-    <term name="long-ordinal-06">sechste</term>
-    <term name="long-ordinal-07">siebte</term>
-    <term name="long-ordinal-08">achte</term>
-    <term name="long-ordinal-09">neunte</term>
-    <term name="long-ordinal-10">zehnte</term>
-  </terms>
-</locale>
-
-<!--
+  <locale xml:lang="de">
+    <terms>
+      <term name="accessed">gesehen am</term>
+      <term name="editor" form="short">
+        <single>Hg</single>
+        <multiple>Hg</multiple>
+      </term>
+      <term name="editor" form="verb-short">
+        <single>Hg. v</single>
+        <multiple>Hg. v</multiple>
+      </term>
+      <term name="translator" form="short">
+        <single>Übers</single>
+        <multiple>Übers</multiple>
+      </term>
+      <term name="translator" form="verb-short">
+        <single>Übers. v</single>
+        <multiple>Übers. v</multiple>
+      </term>
+      <term name="accessed">gesehen am</term>
+      <term name="ordinal-01">.</term>
+      <term name="ordinal-02">.</term>
+      <term name="ordinal-03">.</term>
+      <term name="ordinal-04">.</term>
+      <term name="long-ordinal-01">erste</term>
+      <term name="long-ordinal-02">zweite</term>
+      <term name="long-ordinal-03">dritte</term>
+      <term name="long-ordinal-04">vierte</term>
+      <term name="long-ordinal-05">fünfte</term>
+      <term name="long-ordinal-06">sechste</term>
+      <term name="long-ordinal-07">siebte</term>
+      <term name="long-ordinal-08">achte</term>
+      <term name="long-ordinal-09">neunte</term>
+      <term name="long-ordinal-10">zehnte</term>
+    </terms>
+  </locale>
+  <!--
 ================================================================================
    MAKROS
 ================================================================================
 -->
-
-<!--
+  <!--
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
    VERTEILUNG DER NAMEN AUF DIE MAKROS
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -154,638 +142,459 @@ a) mit Name "editor" (bei Typ "chapter" (und "article"?) und falls Variable "con
 
 a) mit Name "collection-editor" (in jedem Fall)
 -->
-
-<!-- 1. TITEL-BEITRAGENDE IN LANGFORM -->
-<!-- (für die erste Nennung in den Nachweisen) -->
-<macro name="contributors-long">
-  <choose>
-    <!-- Wenn Autoren vorhanden sind, sind diese die 1. Titel-Beitragenden. -->
-    <if variable="author">
-      <names variable="author">
-	<!-- Alle Autoren in gewöhnlicher Ordnung, mehrere Autoren
+  <!-- 1. TITEL-BEITRAGENDE IN LANGFORM -->
+  <!-- (für die erste Nennung in den Nachweisen) -->
+  <macro name="contributors-long">
+    <choose>
+      <!-- Wenn Autoren vorhanden sind, sind diese die 1. Titel-Beitragenden. -->
+      <if variable="author">
+        <names variable="author">
+          <!-- Alle Autoren in gewöhnlicher Ordnung, mehrere Autoren
 	     durch Komma getrennt. -->
-	<name delimiter=", "
-	      delimiter-precedes-last="always"/>
-      </names>
-    </if>
-    <!-- Wenn keine Autoren vorhanden sind, sind bei Büchern
+          <name delimiter=", " delimiter-precedes-last="always"/>
+        </names>
+      </if>
+      <!-- Wenn keine Autoren vorhanden sind, sind bei Büchern
 	 die Herausgeber die 1. Titel-Beitragenden. -->
-    <else>
-      <choose>
-	<if type="book">
-	  <names variable="editor">
-	    <!-- Alle Herausgeber in gewöhnlicher Ordnung, mehrere
+      <else>
+        <choose>
+          <if type="book">
+            <names variable="editor">
+              <!-- Alle Herausgeber in gewöhnlicher Ordnung, mehrere
 		 Herausgeber durch Komma getrennt. -->
-	    <name delimiter=", "
-		  delimiter-precedes-last="always"/>
-	    <!-- Bezeichnung geklammert, in Kurzform und nachgestellt
+              <name delimiter=", " delimiter-precedes-last="always"/>
+              <!-- Bezeichnung geklammert, in Kurzform und nachgestellt
 		 ("(Hg.)"). -->
-	    <label prefix=" ("
-		   form="short"
-		   suffix=".)"/>
-	    <!-- Fehlen die Herausgeber, so werden sie durch ?? ersetzt.
+              <label prefix=" (" form="short" suffix=".)"/>
+              <!-- Fehlen die Herausgeber, so werden sie durch ?? ersetzt.
 		 <substitute>
 		 <names variable="translator"/>
 		 <text variable="title"/>
 		 </substitute> -->
-	  </names>
-	</if>
-	<!-- Für alle anderen Fälle gilt: ??.
+            </names>
+          </if>
+          <!-- Für alle anderen Fälle gilt: ??.
 	     <else>
 	     </else>  -->
-      </choose>
-    </else>
-  </choose>
-</macro>
-
-<!-- 1. TITEL-BEITRAGENDE IN KURZFORM -->
-<!-- (für die zweite und alle folgenden Nennungen in den Nachweisen) -->
-<macro name="contributors-short">
-  <choose>
-    <!-- Wenn Autoren vorhanden sind, sind diese die 1. Titel-Beitragenden. -->
-    <if variable="author">
-      <names variable="author">
-	<!-- Autoren nur mit Nachnamen geführt, mehrere Autoren durch
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <!-- 1. TITEL-BEITRAGENDE IN KURZFORM -->
+  <!-- (für die zweite und alle folgenden Nennungen in den Nachweisen) -->
+  <macro name="contributors-short">
+    <choose>
+      <!-- Wenn Autoren vorhanden sind, sind diese die 1. Titel-Beitragenden. -->
+      <if variable="author">
+        <names variable="author">
+          <!-- Autoren nur mit Nachnamen geführt, mehrere Autoren durch
 	     Komma getrennt. -->
-	  <name form="short"
-		delimiter=", "
-		delimiter-precedes-last="always"/>
-      </names>
-    </if>
-    <!-- Wenn keine Autoren vorhanden sind, sind bei Büchern
+          <name form="short" delimiter=", " delimiter-precedes-last="always"/>
+        </names>
+      </if>
+      <!-- Wenn keine Autoren vorhanden sind, sind bei Büchern
 	 die Herausgeber die 1. Titel-Beitragenden. -->
-    <else>
-      <choose>
-	<if type="book">
-	  <names variable="editor">
-	    <!-- Herausgeber nur mit Nachnamen geführt, mehrere Herausgeber
+      <else>
+        <choose>
+          <if type="book">
+            <names variable="editor">
+              <!-- Herausgeber nur mit Nachnamen geführt, mehrere Herausgeber
 		 durch Komma getrennt. -->
-	    <name form="short"
-		  delimiter=", "
-		  delimiter-precedes-last="always"/>
-	    <!-- Bezeichnung geklammert, in Kurzform und nachgestellt
+              <name form="short" delimiter=", " delimiter-precedes-last="always"/>
+              <!-- Bezeichnung geklammert, in Kurzform und nachgestellt
 		 ("(Hg.)"). -->
-	    <label prefix=" ("
-		   form="short"
-		   suffix=".)"/>
-	    <!-- Fehlen die Herausgeber, so werden sie durch ?? ersetzt.
+              <label prefix=" (" form="short" suffix=".)"/>
+              <!-- Fehlen die Herausgeber, so werden sie durch ?? ersetzt.
 		 <substitute>
 		 <names variable="translator"/>
 		 <text variable="title"/>
 		 </substitute> -->
-	  </names>
-	</if>
-	<!-- Für alle anderen Fälle gilt: ??.
+            </names>
+          </if>
+          <!-- Für alle anderen Fälle gilt: ??.
 	     <else>
 	     </else>  -->
-      </choose>
-    </else>
-  </choose>
-</macro>
-
-<!-- 2. TITEL-BEITRAGENDE -->
-<macro name="secondary-contributors">
-  <choose>
-    <!-- Wenn Autoren vorhanden sind, sind bei Büchern die Herausgeber die 2. Titel-Beitragenden. -->
-    <if variable="author" type="book" match="all">
-      <names variable="editor"
-	     delimiter=", ">
-	<!-- Bezeichnung in Kurzform ("hg. v."). -->
-	<label prefix=""
-	       form="verb-short"
-	       text-case="lowercase"
-	       suffix=". "/>
-	<!-- Mehrere Herausgeber durch Komma getrennt. -->
-	<name delimiter=", "
-	      delimiter-precedes-last="always"/>
-	<!-- Fehlen diese, so werden sie durch ?? ersetzt.
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <!-- 2. TITEL-BEITRAGENDE -->
+  <macro name="secondary-contributors">
+    <choose>
+      <!-- Wenn Autoren vorhanden sind, sind bei Büchern die Herausgeber die 2. Titel-Beitragenden. -->
+      <if variable="author" type="book" match="all">
+        <names variable="editor" delimiter=", ">
+          <!-- Bezeichnung in Kurzform ("hg. v."). -->
+          <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+          <!-- Mehrere Herausgeber durch Komma getrennt. -->
+          <name delimiter=", " delimiter-precedes-last="always"/>
+          <!-- Fehlen diese, so werden sie durch ?? ersetzt.
 	     <substitute>
 	     <text variable="title"/>
 	     </substitute> -->
-      </names>
-    </if>
-    <!-- Für alle anderen Fälle gilt: ??.
+        </names>
+      </if>
+      <!-- Für alle anderen Fälle gilt: ??.
 	 <else>
 	 </else>  -->
-  </choose>
-</macro>
-
-<!-- 1. CONTAINER-BEITRAGENDE -->
-<macro name="container-contributors">
-  <choose>
-    <!-- Wenn Container-Autoren vorhanden sind, sind diese
+    </choose>
+  </macro>
+  <!-- 1. CONTAINER-BEITRAGENDE -->
+  <macro name="container-contributors">
+    <choose>
+      <!-- Wenn Container-Autoren vorhanden sind, sind diese
 	 die 1. Container-Beitragenden. -->
-    <if variable="container-author">
-      <names variable="container-author">
-	<!-- Alle Autoren in gewöhnlicher Ordnung, mehrere Autoren
+      <if variable="container-author">
+        <names variable="container-author">
+          <!-- Alle Autoren in gewöhnlicher Ordnung, mehrere Autoren
 	     durch Komma getrennt. -->
-	<name delimiter=", "
-	      delimiter-precedes-last="always"/>
-      </names>
-    </if>
-    <!-- Wenn keine Container-Autoren vorhanden sind, sind bei Artikeln
+          <name delimiter=", " delimiter-precedes-last="always"/>
+        </names>
+      </if>
+      <!-- Wenn keine Container-Autoren vorhanden sind, sind bei Artikeln
 	 die Herausgeber die 1. Container-Beitragenden. -->
-    <else>
-      <choose>
-	<if type="chapter">
-	  <names variable="editor">
-	    <!-- Alle Herausgeber in gewöhnlicher Ordnung, mehrere
+      <else>
+        <choose>
+          <if type="chapter">
+            <names variable="editor">
+              <!-- Alle Herausgeber in gewöhnlicher Ordnung, mehrere
 		 Herausgeber durch Komma getrennt. -->
-	    <name delimiter=", "
-		  delimiter-precedes-last="always"/>
-	    <!-- Bezeichnung geklammert, in Kurzform und nachgestellt
+              <name delimiter=", " delimiter-precedes-last="always"/>
+              <!-- Bezeichnung geklammert, in Kurzform und nachgestellt
 		 ("(Hg.)"). -->
-	    <label prefix=" ("
-		   form="short"
-		   suffix=".)"/>
-	    <!-- Fehlen diese, so werden sie durch ?? ersetzt.
+              <label prefix=" (" form="short" suffix=".)"/>
+              <!-- Fehlen diese, so werden sie durch ?? ersetzt.
 		 <substitute>
 		 <text variable="title"/>
 		 </substitute> -->
-	  </names>
-	</if>
-	<!-- Für alle anderen Fälle gilt: ??.
+            </names>
+          </if>
+          <!-- Für alle anderen Fälle gilt: ??.
 	     <else>
 	     </else>  -->
-      </choose>
-    </else>
-  </choose>
-</macro>
-
-<!-- 2. CONTAINER-BEITRAGENDE -->
-<macro name="secondary-container-contributors">
-  <choose>
-    <!-- Wenn Container-Autoren vorhanden sind, sind bei Artikeln
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <!-- 2. CONTAINER-BEITRAGENDE -->
+  <macro name="secondary-container-contributors">
+    <choose>
+      <!-- Wenn Container-Autoren vorhanden sind, sind bei Artikeln
 	 die Herausgeber die 2. Container-Beitragenden. -->
-    <if variable="container-author" type="chapter" match="all">
-      <names variable="editor">
-	<!-- Bezeichnung in Kurzform ("hg. v."). -->
-	<label prefix=""
-	       form="verb-short"
-	       text-case="lowercase"
-	       suffix=". "/>
-	<!-- Mehrere Herausgeber durch Komma getrennt. -->
-	<name delimiter=", "
-	      delimiter-precedes-last="always"/>
-	<!-- Fehlen diese, so werden sie durch ?? ersetzt.
+      <if variable="container-author" type="chapter" match="all">
+        <names variable="editor">
+          <!-- Bezeichnung in Kurzform ("hg. v."). -->
+          <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+          <!-- Mehrere Herausgeber durch Komma getrennt. -->
+          <name delimiter=", " delimiter-precedes-last="always"/>
+          <!-- Fehlen diese, so werden sie durch ?? ersetzt.
 	     <substitute>
 	     <text variable="title"/>
 	     </substitute> -->
-      </names>
-      <!-- Für alle anderen Fälle gilt: ??.
+        </names>
+        <!-- Für alle anderen Fälle gilt: ??.
 	   <else>
 	   </else>  -->
-    </if>
-  </choose>
-</macro>
-
-<!-- 2. REIHEN-BEITRAGENDE -->
-<macro name="secondary-collection-contributors">
-  <names variable="collection-editor">
-    <!-- Mehrere Reihen-Herausgeber durch Komma getrennt. -->
-    <name delimiter=", "
-	  delimiter-precedes-last="always"/>
-  </names>
-</macro>
-
-<!-- ÜBERSETZER -->
-<macro name="translatedby">
-  <names variable="translator">
-    <label prefix=""
-	   form="verb-short"
-	   text-case="lowercase"
-	   suffix=". "/>
-    <name delimiter=", "
-	  delimiter-precedes-last="always"/>
-  </names>
-</macro>
-
-<!-- TITEL IN LANGFORM -->
-<macro name="title-long">
-  <group delimiter=", ">
-    <choose>
-
-      <!-- Buchtitel werden kursiviert, ... -->
-      <if type="book">
-	<text variable="title"
-	      form="long"
-	      font-style="italic"/>
       </if>
-
-      <!-- ... alle anderen Titel ohne Auszeichnung ausgegeben. -->
-      <else>
-	<text variable="title"
-	      form="long"/>
-      </else>
-
     </choose>
-
+  </macro>
+  <!-- 2. REIHEN-BEITRAGENDE -->
+  <macro name="secondary-collection-contributors">
+    <names variable="collection-editor">
+      <!-- Mehrere Reihen-Herausgeber durch Komma getrennt. -->
+      <name delimiter=", " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <!-- ÜBERSETZER -->
+  <macro name="translatedby">
+    <names variable="translator">
+      <label prefix="" form="verb-short" text-case="lowercase" suffix=". "/>
+      <name delimiter=", " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <!-- TITEL IN LANGFORM -->
+  <macro name="title-long">
+    <group delimiter=", ">
+      <choose>
+        <!-- Buchtitel werden kursiviert, ... -->
+        <if type="book">
+          <text variable="title" form="long" font-style="italic"/>
+        </if>
+        <!-- ... alle anderen Titel ohne Auszeichnung ausgegeben. -->
+        <else>
+          <text variable="title" form="long"/>
+        </else>
+      </choose>
+      <choose>
+        <!-- Bei Büchern ... -->
+        <if type="book">
+          <!-- wird ggf. der Band ausgegeben. -->
+          <group>
+            <choose>
+              <if variable="volume">
+                <text term="volume" form="short" suffix=". "/>
+                <text variable="volume"/>
+              </if>
+            </choose>
+          </group>
+        </if>
+      </choose>
+      <!-- 2. Titel-Beitragende -->
+      <text macro="secondary-contributors"/>
+    </group>
+  </macro>
+  <!-- TITEL IN KURZFORM -->
+  <macro name="title-short">
+    <group delimiter=", ">
+      <choose>
+        <!-- Buchtitel werden kursiviert, ... -->
+        <if type="book">
+          <text variable="title" form="short" font-style="italic"/>
+        </if>
+        <!-- ... alle anderen Titel ohne Auszeichnung ausgegeben. -->
+        <else>
+          <text variable="title" form="short"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <!-- CONTAINER (Sammelband oder Zeitschrift ...) -->
+  <macro name="container">
     <choose>
-
-      <!-- Bei Büchern ... -->
-      <if type="book">
-	<!-- wird ggf. der Band ausgegeben. -->
-	<group>
-	  <choose>
-	    <if variable="volume">
-	      <text term="volume"
-		    form="short"
-		    suffix=". "/>
-	      <text variable="volume"/>
-	    </if>
-	  </choose>
-	</group>
+      <!-- Für Beiträge in Sammelbänden gilt: -->
+      <if type="chapter">
+        <choose>
+          <!-- Falls 1. Container-Beitragende vorhanden sind,
+	     werden sie mit vorangestelltem "in: " ausgegeben -->
+          <if variable="container-author editor" match="any">
+            <text term="in" suffix=": "/>
+          </if>
+        </choose>
+        <!-- 1. Container-Beitragende -->
+        <text macro="container-contributors" suffix=", "/>
+        <!-- Container-Titel -->
+        <text variable="container-title" font-style="italic"/>
+        <!-- Ggf. wird der Band ausgegeben. -->
+        <choose>
+          <if variable="volume">
+            <text prefix=", " term="volume" form="short" suffix=". "/>
+            <text prefix="" variable="volume"/>
+          </if>
+        </choose>
+        <!-- 2. Container-Beitragende -->
+        <text prefix=", " macro="secondary-container-contributors"/>
       </if>
-
+      <!-- Für Artikel gilt: -->
+      <else-if type="article-journal article-magazine article-newspaper">
+        <!-- Container-Titel -->
+        <text prefix="in: " variable="container-title" font-style="italic" suffix=", "/>
+      </else-if>
+      <!-- Für alle anderen Fälle gilt: ??.
+	 <else>
+	 </else> -->
     </choose>
-
-    <!-- 2. Titel-Beitragende -->
-    <text macro="secondary-contributors"/>
-  </group>
-</macro>
-
-<!-- TITEL IN KURZFORM -->
-<macro name="title-short">
-  <group delimiter=", ">
+  </macro>
+  <!-- REIHE -->
+  <macro name="collection">
+    <!-- Name der Reihe -->
+    <text variable="collection-title"/>
     <choose>
-
-      <!-- Buchtitel werden kursiviert, ... -->
-      <if type="book">
-	<text variable="title"
-	      form="short"
-	      font-style="italic"/>
+      <!-- Reihennummer -->
+      <!-- Falls die Reihennummer eine Zahl ist, wird sie
+	 ohne vorangestelltes Komma ausgeben, ... -->
+      <!-- FUNKTIONIERT NICHT! -->
+      <if is-numeric="collection-number">
+        <text prefix=" " variable="collection-number"/>
       </if>
-
-      <!-- ... alle anderen Titel ohne Auszeichnung ausgegeben. -->
+      <!-- ... ansonsten mit. -->
       <else>
-	<text variable="title"
-	      form="short"/>
+        <text prefix=", " variable="collection-number"/>
       </else>
-
     </choose>
-  </group>
-</macro>
-
-<!-- CONTAINER (Sammelband oder Zeitschrift ...) -->
-<macro name="container">
-  <choose>
-
-    <!-- Für Beiträge in Sammelbänden gilt: -->
-    <if type="chapter">
-      <choose>
-	<!-- Falls 1. Container-Beitragende vorhanden sind,
-	     werden sie mit vorangestelltem "in: " ausgegeben -->
-	<if variable="container-author editor" match="any">
-	  <text term="in"
-		suffix=": "/>
-	</if>
-      </choose>
-
-      <!-- 1. Container-Beitragende -->
-      <text macro="container-contributors"
-	    suffix=", "/>
-      <!-- Container-Titel -->
-      <text variable="container-title"
-	    font-style="italic"/>
-
-      <!-- Ggf. wird der Band ausgegeben. -->
-      <choose>
-	<if variable="volume">
-	  <text prefix=", "
-		term="volume"
-		form="short"
-		suffix=". "/>
-	  <text prefix=""
-		variable="volume"/>
-	</if>
-      </choose>
-
-      <!-- 2. Container-Beitragende -->
-      <text prefix=", "
-	    macro="secondary-container-contributors"/>
-    </if>
-
-    <!-- Für Artikel gilt: -->
-    <else-if type="article-journal article-magazine article-newspaper">
-      <!-- Container-Titel -->
-      <text prefix="in: "
-	    variable="container-title"
-	    font-style="italic"
-	    suffix=", "/>
-    </else-if>
-
-    <!-- Für alle anderen Fälle gilt: ??.
-	 <else>
-	 </else> -->
-
-  </choose>
-</macro>
-
-<!-- REIHE -->
-<macro name="collection">
-
-  <!-- Name der Reihe -->
-  <text variable="collection-title"/>
-
-  <choose>
-    <!-- Reihennummer -->
-
-    <!-- Falls die Reihennummer eine Zahl ist, wird sie
-	 ohne vorangestelltes Komma ausgeben, ... -->
-    <!-- FUNKTIONIERT NICHT! -->
-    <if is-numeric="collection-number">
-      <text prefix=" "
-	    variable="collection-number"/>
-    </if>
-
-    <!-- ... ansonsten mit. -->
-    <else>
-      <text prefix=", "
-	    variable="collection-number"/>
-    </else>
-
-  </choose>
-
-  <choose>
-    <if variable="collection-editor">
-      <!-- Bezeichnung der Reihenbeitragenden in Kurzform ("hg. v.") -->
-      <text prefix=", "
-	    term="editor"
-	    form="verb-short"
-	    text-case="lowercase"
-	    suffix=". "/>
-      <!-- Reihen-Beitragende -->
-      <text prefix=" "
-	    macro="secondary-collection-contributors"/>
-    </if>
-  </choose>
-
-</macro>
-
-<!-- AUFLAGE -->
-<macro name="edition">
-  <choose>
-
-    <!-- Falls die Auflage eine Zahl ist, wird sie numerisch ausgegeben und
+    <choose>
+      <if variable="collection-editor">
+        <!-- Bezeichnung der Reihenbeitragenden in Kurzform ("hg. v.") -->
+        <text prefix=", " term="editor" form="verb-short" text-case="lowercase" suffix=". "/>
+        <!-- Reihen-Beitragende -->
+        <text prefix=" " macro="secondary-collection-contributors"/>
+      </if>
+    </choose>
+  </macro>
+  <!-- AUFLAGE -->
+  <macro name="edition">
+    <choose>
+      <!-- Falls die Auflage eine Zahl ist, wird sie numerisch ausgegeben und
 	 mit einem Punkt abgeschlossen (z. B. "1. Aufl."), ... -->
-    <if is-numeric="edition">
-      <number variable="edition"
-	      form="ordinal"/>
-      <text prefix=" "
-	    term="edition"
-	    form="short"
-	    suffix="."/>
-    </if>
-
-    <!-- ... ansonsten wird sie als Text ausgegeben und ohne Punkt
+      <if is-numeric="edition">
+        <number variable="edition" form="ordinal"/>
+        <text prefix=" " term="edition" form="short" suffix="."/>
+      </if>
+      <!-- ... ansonsten wird sie als Text ausgegeben und ohne Punkt
 	 abgeschlossen (z.B. "erste Aufl.").  -->
-    <else-if variable="edition">
-      <text variable="edition"/>
-      <text prefix=" "
-	    term="edition"
-	    form="short"
-	    suffix="."/>
-    </else-if>
-
-  </choose>
-</macro>
-
-<!-- VERLAGSORT/VERLEGER -->
-<macro name="publisher">
-  <text variable="publisher-place"/>
-  <text prefix=" ("
-	variable="publisher"
-	suffix=")"/>
-</macro>
-
-<!-- VERÖFFENTLICHUNG (Band, Reihe, Auflage, Verlag, Ort, Datum ...) -->
-<macro name="issued">
-  <choose>
-
-    <!-- Für Bücher und Beiträge in Sammelbänden gilt: -->
-    <if type="book chapter" match="any">
-      <!-- Auflage -->
-      <text prefix=", "
-	    macro="edition"/>
-      <!-- Verlagsort/Verleger -->
-      <text prefix=", "
-	    macro="publisher"/>
-      <!-- Jahr -->
-      <date prefix=" "
-	    variable="issued" >
-	<date-part name="year"/>
-      </date>
-      <!-- Reihe -->
-      <text prefix=" ("
-	    macro="collection"
-	    suffix=")"/>
-    </if>
-
-    <!-- Für Artikel gilt: -->
-    <else-if type="article-journal article-magazine article-newspaper">
-      <choose>
-	<!-- ... wenn Band und Ausgabe vorhanden sind: -->
-	<if variable="volume">
-	  <group>
-	    <choose>
-
-	      <if variable="issue">
-		<text variable="volume"
-		      suffix="/"/>
-	      </if>
-
-	      <else>
-		<text variable="volume"/>
-	      </else>
-
-	    </choose>
-	    <number variable="issue"/>
-	  </group>
-	</if>
-
-	<!-- wenn nur Ausgabe vorhanden ist: -->
-	<else>
-	  <number prefix=""
-		  variable="issue"
-		  suffix=""/>
-	</else>
-
-      </choose>
-      <!-- Jahr -->
-      <date prefix=", "
-	    variable="issued"
-	    suffix="">
-	<date-part name="year"/>
-      </date>
-    </else-if>
-
-    <!-- Für alle anderen Fälle gilt: ??.
+      <else-if variable="edition">
+        <text variable="edition"/>
+        <text prefix=" " term="edition" form="short" suffix="."/>
+      </else-if>
+    </choose>
+  </macro>
+  <!-- VERLAGSORT/VERLEGER -->
+  <macro name="publisher">
+    <text variable="publisher-place"/>
+    <text prefix=" (" variable="publisher" suffix=")"/>
+  </macro>
+  <!-- VERÖFFENTLICHUNG (Band, Reihe, Auflage, Verlag, Ort, Datum ...) -->
+  <macro name="issued">
+    <choose>
+      <!-- Für Bücher und Beiträge in Sammelbänden gilt: -->
+      <if type="book chapter" match="any">
+        <!-- Auflage -->
+        <text prefix=", " macro="edition"/>
+        <!-- Verlagsort/Verleger -->
+        <text prefix=", " macro="publisher"/>
+        <!-- Jahr -->
+        <date prefix=" " variable="issued">
+          <date-part name="year"/>
+        </date>
+        <!-- Reihe -->
+        <text prefix=" (" macro="collection" suffix=")"/>
+      </if>
+      <!-- Für Artikel gilt: -->
+      <else-if type="article-journal article-magazine article-newspaper">
+        <choose>
+          <!-- ... wenn Band und Ausgabe vorhanden sind: -->
+          <if variable="volume">
+            <group>
+              <choose>
+                <if variable="issue">
+                  <text variable="volume" suffix="/"/>
+                </if>
+                <else>
+                  <text variable="volume"/>
+                </else>
+              </choose>
+              <number variable="issue"/>
+            </group>
+          </if>
+          <!-- wenn nur Ausgabe vorhanden ist: -->
+          <else>
+            <number prefix="" variable="issue" suffix=""/>
+          </else>
+        </choose>
+        <!-- Jahr -->
+        <date prefix=", " variable="issued" suffix="">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <!-- Für alle anderen Fälle gilt: ??.
 	 <else>
 	 </else> -->
-
-  </choose>
-</macro>
-
-<!-- SEITENZAHLEN -->
-<macro name="pages">
-  <choose>
-    <!-- Seitenzahlen werden nur bei Beiträgen in Sammelbänden und
+    </choose>
+  </macro>
+  <!-- SEITENZAHLEN -->
+  <macro name="pages">
+    <choose>
+      <!-- Seitenzahlen werden nur bei Beiträgen in Sammelbänden und
 	 Artikeln ausgegeben - nicht bei Büchern o.a., wo damit
 	 der Gesamtumfang gemeint ist. -->
-    <if type="article-journal article-magazine article-newspaper chapter" match="any">
-      <text variable="page"/>
-    </if>
-  </choose>
-</macro>
-
-<!-- URL (und Datum des letzten Zugriffs) -->
-<macro name="access">
-  <choose>
-    <if variable="URL">
-      <text variable="URL"/>
-      <group prefix=", "
-	     suffix=""
-	     delimiter=" ">
-	<text term="accessed"
-	      text-case="lowercase"/>
-	<date variable="accessed">
-	  <date-part name="day"
-		     form="numeric"
-		     suffix="."/>
-	  <date-part name="month"
-		     form="numeric"
-		     suffix="."/>
-	  <date-part name="year"/>
-	</date>
-      </group>
-    </if>
-  </choose>
-</macro>
-
-<!-- FUNDSTELLE (bei Nachweisen) -->
-<macro name="citation-locator">
-  <!-- Angabe der Seiten o.ä. -->
-  <text variable="locator"/>
-</macro>
-
-<!--
+      <if type="article-journal article-magazine article-newspaper chapter" match="any">
+        <text variable="page"/>
+      </if>
+    </choose>
+  </macro>
+  <!-- URL (und Datum des letzten Zugriffs) -->
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <text variable="URL"/>
+        <group prefix=", " suffix="" delimiter=" ">
+          <text term="accessed" text-case="lowercase"/>
+          <date variable="accessed">
+            <date-part name="day" form="numeric" suffix="."/>
+            <date-part name="month" form="numeric" suffix="."/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <!-- FUNDSTELLE (bei Nachweisen) -->
+  <macro name="citation-locator">
+    <!-- Angabe der Seiten o.ä. -->
+    <text variable="locator"/>
+  </macro>
+  <!--
 ================================================================================
    NACHWEISE (in Anmerkungen)
 ================================================================================
 -->
-
-<citation et-al-min="4"
-	  et-al-use-first="1"
-	  et-al-subsequent-min="4"
-	  et-al-subsequent-use-first="1"
-	  disambiguate-add-names="true">
-  <layout suffix="."
-	  delimiter="; ">
-    <choose>
-
-      <!-- "Ebd." (bei unmittelbar aufeinanderfolgenden Nachweisen) -->
-      <if position="ibid-with-locator">
-	<text term="ibid"
-	      text-case="capitalize-first"
-	      suffix="."/>
-	<text prefix=", "
-	      macro="citation-locator"/>
-      </if>
-
-      <else-if position="ibid">
-	<text term="ibid"
-	      text-case="capitalize-first"
-	      suffix="."/>
-      </else-if>
-
-      <!-- kurzer Nachweis (bei zweiter und folgenden Nennungen) -->
-      <else-if position="subsequent">
-	<text macro="contributors-short"
-	      suffix=", "/>
-	<text macro="title-short"/>
-	<text prefix=", "
-	      macro="citation-locator"/>
-      </else-if>
-
-      <!-- vollständiger Nachweis (bei erster Nennung) -->
-      <else>
-	<text macro="contributors-long"
-	      suffix=", "/>
-	<text macro="title-long"/>
-	<text prefix=", "
-	      macro="container"/>
-	<text macro="issued"/>
-	<text prefix=", "
-	      macro="pages"/>
-
-	<choose>
-	  <!-- Bei Beiträgen in Sammelbänden und Artikeln wird die
+  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-names="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <!-- "Ebd." (bei unmittelbar aufeinanderfolgenden Nachweisen) -->
+        <if position="ibid-with-locator">
+          <text term="ibid" text-case="capitalize-first" suffix="."/>
+          <text prefix=", " macro="citation-locator"/>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" text-case="capitalize-first" suffix="."/>
+        </else-if>
+        <!-- kurzer Nachweis (bei zweiter und folgenden Nennungen) -->
+        <else-if position="subsequent">
+          <text macro="contributors-short" suffix=", "/>
+          <text macro="title-short"/>
+          <text prefix=", " macro="citation-locator"/>
+        </else-if>
+        <!-- vollständiger Nachweis (bei erster Nennung) -->
+        <else>
+          <text macro="contributors-long" suffix=", "/>
+          <text macro="title-long"/>
+          <text prefix=", " macro="container"/>
+          <text macro="issued"/>
+          <text prefix=", " macro="pages"/>
+          <choose>
+            <!-- Bei Beiträgen in Sammelbänden und Artikeln wird die
 	       Angabe der Fundstelle in Seitenzahlen durch "hier"
 	       eingeschränkt. -->
-	  <if variable="page" type="chapter" match="all">
-	    <text prefix=", hier "
-		  macro="citation-locator"/>
-	  </if>
-
-	  <else-if variable="page" type="article-journal" match="all">
-	    <text prefix=", hier "
-		  macro="citation-locator"/>
-	  </else-if>
-
-	  <else-if variable="page" type="article-magazine" match="all">
-	    <text prefix=", hier "
-		  macro="citation-locator"/>
-	  </else-if>
-
-	  <else-if variable="page" type="article-newspaper" match="all">
-	    <text prefix=", hier "
-		  macro="citation-locator"/>
-	  </else-if>
-
-	  <else>
-	    <text prefix=", "
-		  macro="citation-locator"/>
-	  </else>
-
-	</choose>
-	<text macro="access"/>
-	<text prefix=", "
-	      macro="translatedby"/>
-      </else>
-    </choose>
-  </layout>
-</citation>
-
-<!--
+            <if variable="page" type="chapter" match="all">
+              <text prefix=", hier " macro="citation-locator"/>
+            </if>
+            <else-if variable="page" type="article-journal" match="all">
+              <text prefix=", hier " macro="citation-locator"/>
+            </else-if>
+            <else-if variable="page" type="article-magazine" match="all">
+              <text prefix=", hier " macro="citation-locator"/>
+            </else-if>
+            <else-if variable="page" type="article-newspaper" match="all">
+              <text prefix=", hier " macro="citation-locator"/>
+            </else-if>
+            <else>
+              <text prefix=", " macro="citation-locator"/>
+            </else>
+          </choose>
+          <text macro="access"/>
+          <text prefix=", " macro="translatedby"/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <!--
 ================================================================================
    LITERATURVERZEICHNIS
 ================================================================================
 -->
-
-<bibliography et-al-min="4"
-	      et-al-use-first="1"
-	      hanging-indent="true"
-	      entry-spacing="0"
-	      subsequent-author-substitute="---">
-  <sort>
-    <key macro="contributors-long"
-	 names-min="3"
-	 names-use-first="3"/>
-    <key macro="title-long"/>
-  </sort>
-  <layout suffix=".">
-    <text macro="contributors-long"
-	  suffix=", "/>
-    <text macro="title-long"/>
-    <text prefix=", "
-	  macro="container"/>
-    <text macro="issued"/>
-    <text prefix=", "
-	  macro="pages"/>
-    <text macro="access"/>
-    <text prefix=", "
-	  macro="translatedby"/>
-  </layout>
-</bibliography>
-
-</style>
\ No newline at end of file
+  <bibliography et-al-min="4" et-al-use-first="1" hanging-indent="true" entry-spacing="0" subsequent-author-substitute="---">
+    <sort>
+      <key macro="contributors-long" names-min="3" names-use-first="3"/>
+      <key macro="title-long"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="contributors-long" suffix=", "/>
+      <text macro="title-long"/>
+      <text prefix=", " macro="container"/>
+      <text macro="issued"/>
+      <text prefix=", " macro="pages"/>
+      <text macro="access"/>
+      <text prefix=", " macro="translatedby"/>
+    </layout>
+  </bibliography>
+</style>