From 25de5b2d04bb4b6a5f29c6ba339ba3af7bbfa612 Mon Sep 17 00:00:00 2001
From: rmzelle <rintze.zelle@gmail.com>
Date: Thu, 22 Dec 2011 20:37:54 -0500
Subject: [PATCH] Pretty print more independent styles, add Creative Commons
 by-sa license if not already present.

---
 aaa.csl                                     | 375 ++++-----
 aacr.csl                                    | 231 +++---
 acm-sigchi-proceedings.csl                  | 279 +++----
 american-journal-of-archaeology.csl         | 705 ++++++++---------
 american-meteorological-society.csl         |   3 +-
 australian-historical-studies.csl           | 729 ++++++++---------
 australian-legal.csl                        | 817 +++++++++++---------
 bioorganic-medicinal-chemistry-letters.csl  | 337 ++++----
 blank.csl                                   |  25 +-
 cepal.csl                                   | 771 +++++++++---------
 chinese-building-structure.csl              | 207 ++---
 clinical-cancer-research.csl                | 223 +++---
 diplo.csl                                   | 749 +++++++++---------
 fachhochschule-vorarlberg.csl               |  59 +-
 geological-magazine.csl                     |   7 +-
 harvard-cardiff-uni.csl                     |   3 +-
 ieee-w-url.csl                              | 267 +++----
 inter-ro.csl                                | 619 +++++++--------
 ipvs.csl                                    | 157 ++--
 jeb.csl                                     | 283 +++----
 jghe.csl                                    | 625 +++++++--------
 journal-of-experimental-biology.csl         | 122 ++-
 limnology-and-oceanography.csl              | 399 +++++-----
 mcgill-legal.csl                            | 251 +++---
 methods-information-medicine.csl            |   1 +
 misq.csl                                    | 627 +++++++--------
 molecular-biochemical-parasitology.csl      | 291 +++----
 naa-simple.csl                              |  73 +-
 nature-neuroscience-brief-communication.csl | 135 ++--
 palaeontologia-electronica.csl              | 459 +++++------
 ro-humanities.csl                           | 677 ++++++++--------
 sp-legal.csl                                | 537 ++++++-------
 universite-de-liege-histoire.csl            | 185 +++--
 vienna-legal.csl                            | 757 +++++++++---------
 34 files changed, 6028 insertions(+), 5957 deletions(-)

diff --git a/aaa.csl b/aaa.csl
index 4a60565400..f6b8052c71 100644
--- a/aaa.csl
+++ b/aaa.csl
@@ -16,43 +16,44 @@
     <updated>2008-11-11T12:00:00+00:00</updated>
     <summary>Citation style for the American Anthropological Association - Support from the Society for Cultural Anthropology is thankfully acknowledged</summary>
     <link href="http://www.aaanet.org/publications/style_guide.pdf" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <macro name="secondary-contributors">
     <choose>
       <if type="chapter paper-conference" match="none">
-	<!--<group delimiter=". ">
+        <!--<group delimiter=". ">
 	    <names variable="editor translator" delimiter=", ">
 	    <name and="text" delimiter=", "/>
 	    <label form="short" prefix=", " text-case="lowercase"/>
 	    </names>
 	    </group> -->
-	<group delimiter=". ">
-	  <names variable="editor" delimiter=", ">
-	    <name and="text" delimiter=", "/>
-	    <label form="short" prefix=", " text-case="lowercase"/>
-	  </names>
-	  <names variable="translator" delimiter=", ">
-	    <name and="text" delimiter=", "/>
-	    <label form="short" prefix=", " text-case="lowercase"/>
-	  </names>
-	</group>
+        <group delimiter=". ">
+          <names variable="editor" delimiter=", ">
+            <name and="text" delimiter=", "/>
+            <label form="short" prefix=", " text-case="lowercase"/>
+          </names>
+          <names variable="translator" delimiter=", ">
+            <name and="text" delimiter=", "/>
+            <label form="short" prefix=", " text-case="lowercase"/>
+          </names>
+        </group>
       </if>
     </choose>
   </macro>
   <macro name="container-contributors">
     <choose>
       <if type="chapter paper-conference" match="any">
-	<group delimiter=". " prefix=" ">
-	  <names variable="editor" delimiter=", ">
-	    <name and="text" delimiter=", "/>
-	    <label form="short" prefix=", " text-case="lowercase"/>
-	  </names>
-	  <names variable="translator" delimiter=", ">
-	    <name and="text" delimiter=", "/>
-	    <label form="short" prefix=", " text-case="lowercase"/>
-	  </names>
-	</group>
-	<!-- <group prefix="" delimiter=", ">
+        <group delimiter=". " prefix=" ">
+          <names variable="editor" delimiter=", ">
+            <name and="text" delimiter=", "/>
+            <label form="short" prefix=", " text-case="lowercase"/>
+          </names>
+          <names variable="translator" delimiter=", ">
+            <name and="text" delimiter=", "/>
+            <label form="short" prefix=", " text-case="lowercase"/>
+          </names>
+        </group>
+        <!-- <group prefix="" delimiter=", ">
 	     <names variable="editor translator" delimiter=", ">
 	     <name and="text" delimiter=", "/>
 	     <label form="short" prefix=", " text-case="lowercase"/>	 
@@ -64,14 +65,14 @@
   <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>
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
       </if>
     </choose>
     <names variable="recipient" delimiter=", ">
@@ -82,25 +83,25 @@
   <macro name="contributors">
     <choose>
       <if type="motion_picture" match="none">
-	<names variable="author">
-	  <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-	  <label form="short" prefix=", " text-case="lowercase"/>
-	  <substitute>
-	    <names variable="editor"/>
-	    <names variable="translator"/>
-	    <text macro="title"/>
-	  </substitute>
-	</names>
-	<text macro="recipient"/>
+        <names variable="author">
+          <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+          <label form="short" prefix=", " text-case="lowercase"/>
+          <substitute>
+            <names variable="editor"/>
+            <names variable="translator"/>
+            <text macro="title"/>
+          </substitute>
+        </names>
+        <text macro="recipient"/>
       </if>
       <else>
-	<names variable="author">
-	  <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" suffix=", dir."/>
-	  <label form="short" prefix=", " text-case="lowercase"/>
-	  <substitute>
-	    <text macro="title"/>
-	  </substitute>
-	</names>
+        <names variable="author">
+          <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" suffix=", dir."/>
+          <label form="short" prefix=", " text-case="lowercase"/>
+          <substitute>
+            <text macro="title"/>
+          </substitute>
+        </names>
       </else>
     </choose>
   </macro>
@@ -108,9 +109,9 @@
     <names variable="author">
       <name form="short" and="text" delimiter=", "/>
       <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="title"/>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
@@ -130,94 +131,94 @@
   <macro name="access">
     <choose>
       <if variable="URL">
-	<group delimiter=", ">
-	  <text variable="URL"/>
-	  <group delimiter=" ">
-	    <text term="accessed"/>
-	    <date variable="accessed">
-	      <date-part name="month" form="long"/>
-	      <date-part name="day" prefix=" "/>
-	      <date-part name="year" prefix=", "/>
-	    </date>
-	  </group>
-	</group>
+        <group delimiter=", ">
+          <text variable="URL"/>
+          <group delimiter=" ">
+            <text term="accessed"/>
+            <date variable="accessed">
+              <date-part name="month" form="long"/>
+              <date-part name="day" prefix=" "/>
+              <date-part name="year" prefix=", "/>
+            </date>
+          </group>
+        </group>
       </if>
     </choose>
   </macro>
   <macro name="title">
     <choose>
       <if variable="title" match="none">
-	<choose>
-	  <if type="personal_communication" match="none">
-	    <text variable="genre" text-case="capitalize-first"/>
-	  </if>
-	</choose>
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
       </if>
       <else>
-	<group delimiter=", ">
-	  <text variable="title" text-case="title"/>
-	  <group>
-	    <choose>
-	      <if type="bill book graphic legal_case motion_picture report song" match="any">
-		<group>
-		  <text term="volume" form="short" text-case="lowercase"/>
-		  <number variable="volume" form="numeric"/>
-		</group>
-	      </if>
-	    </choose>
-	  </group>
-	</group>
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <group>
+            <choose>
+              <if type="bill book graphic legal_case motion_picture report song" match="any">
+                <group>
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <number variable="volume" form="numeric"/>
+                </group>
+              </if>
+            </choose>
+          </group>
+        </group>
       </else>
     </choose>
   </macro>
   <macro name="edition">
     <choose>
       <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-	<choose>
-	  <if is-numeric="edition">
-	    <group delimiter=" ">
-	      <number variable="edition" form="ordinal"/>
-	      <text term="edition"  strip-periods="true"/>
-	    </group>
-	  </if>
-	  <else>
-	    <text variable="edition" suffix="."/>
-	  </else>
-	</choose>
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" strip-periods="true"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" suffix="."/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
   <macro name="locators">
     <choose>
       <if type="article-journal">
-	<text variable="volume" prefix=" "/>
-	<text variable="issue" prefix="(" suffix=")"/>
+        <text variable="volume" prefix=" "/>
+        <text variable="issue" prefix="(" suffix=")"/>
       </if>
     </choose>
   </macro>
   <macro name="locators-chapter">
     <choose>
       <if type="chapter paper-conference" match="any">
-	<group delimiter=" ">	  
-	  <label variable="page" form="short" text-case="capitalize-first" prefix=" "/>
-	  <text variable="page"/>
-	</group>
+        <group delimiter=" ">
+          <label variable="page" form="short" text-case="capitalize-first" prefix=" "/>
+          <text variable="page"/>
+        </group>
       </if>
     </choose>
   </macro>
   <macro name="locators-article">
     <choose>
       <if type="article-newspaper article-journal article-magazine">
-	<text variable="page" prefix=": "/>
+        <text variable="page" prefix=": "/>
       </if>
     </choose>
   </macro>
   <macro name="point-locators">
     <group>
       <choose>
-	<if locator="page" match="none">
-	  <label variable="locator" form="short" suffix=" "/>
-	</if>
+        <if locator="page" match="none">
+          <label variable="locator" form="short" suffix=" "/>
+        </if>
       </choose>
       <text variable="locator"/>
     </group>
@@ -228,7 +229,7 @@
   <macro name="container-title">
     <choose>
       <if type="chapter paper-conference" match="any">
-	<text macro="container-prefix" suffix=" "/>
+        <text macro="container-prefix" suffix=" "/>
       </if>
     </choose>
     <text variable="container-title" text-case="title"/>
@@ -236,47 +237,47 @@
   <macro name="publisher">
     <choose>
       <if type="motion_picture" match="none">
-	<group delimiter=": ">
-	  <choose>
-	    <if type="thesis" match="none">
-	      <text variable="publisher-place"/>
-	    </if>
-	  </choose>
-	  <text variable="publisher"/>
-	</group>
+        <group delimiter=": ">
+          <choose>
+            <if type="thesis" match="none">
+              <text variable="publisher-place"/>
+            </if>
+          </choose>
+          <text variable="publisher"/>
+        </group>
       </if>
       <else>
-	<group delimiter=". ">
-	  <text variable="publisher"/>
-	  <text variable="publisher-place"/>
-	</group>
+        <group delimiter=". ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
       </else>
     </choose>
   </macro>
   <macro name="date-reference">
-    <choose>   
-      <if variable="issued"> 
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
       </if>
       <else>
-	<text term="no date" form="short" text-case="lowercase"/>
+        <text term="no date" form="short" text-case="lowercase"/>
       </else>
     </choose>
-  </macro> 
+  </macro>
   <macro name="date-bibliography">
-    <choose>   
-      <if variable="issued"> 
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
       </if>
       <else>
-	<text term="no date" form="short" text-case="capitalize-first"/>
+        <text term="no date" form="short" text-case="capitalize-first"/>
       </else>
     </choose>
-  </macro> 
+  </macro>
   <macro name="day-month">
     <date variable="issued">
       <date-part name="month"/>
@@ -302,96 +303,96 @@
       <if variable="title" match="none"/>
       <else-if type="thesis manuscript" match="any"/>
       <else>
-	<group delimiter=", ">	
-	  <text variable="genre" text-case="capitalize-first"/>
-	  <choose>
-	    <if type="report">
-	      <text variable="number"/>
-	    </if>
-	  </choose>
-	</group>
+        <group delimiter=", ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <choose>
+            <if type="report">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
       </else>
     </choose>
   </macro>
   <macro name="issue">
     <choose>
       <if type="speech">
-	<group  delimiter=", ">
-	  <choose>
-	    <if variable="genre">	  
-	      <text macro="event" prefix=" "/>
-	    </if>
-	    <else>
-	      <text macro="event" prefix=". Paper "/>
-	    </else>
-	  </choose>
-	  <text variable="event-place"/>
-	  <text macro="day-month"/>
-	</group>
+        <group delimiter=", ">
+          <choose>
+            <if variable="genre">
+              <text macro="event" prefix=" "/>
+            </if>
+            <else>
+              <text macro="event" prefix=". Paper "/>
+            </else>
+          </choose>
+          <text variable="event-place"/>
+          <text macro="day-month"/>
+        </group>
       </if>
       <else-if type="article-newspaper article-magazine" match="any">
-	<text macro="day-month" prefix=", "/>
+        <text macro="day-month" prefix=", "/>
       </else-if>
       <else-if type="interview broadcast" match="any">
-	<group prefix=". " delimiter=", ">
-	  <text variable="publisher"/>
-	  <text macro="day-month"/>
-	</group>
+        <group prefix=". " delimiter=", ">
+          <text variable="publisher"/>
+          <text macro="day-month"/>
+        </group>
       </else-if>
       <else>
-	<group prefix=". " delimiter=", ">
-	  <choose>
-	    <if type="thesis manuscript" match="any">
-	      <text variable="genre" text-case="capitalize-first"/>
-	    </if>
-	  </choose>
-	  <text macro="archive"/>	 
-	  <text macro="publisher"/>
-	</group>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis manuscript" match="any">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text macro="archive"/>
+          <text macro="publisher"/>
+        </group>
       </else>
     </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=":">
-	<group delimiter=" ">
-	  <text macro="contributors-short"/>
-	  <text macro="date-reference"/>
-	</group>
-	<text macro="point-locators"/>
+        <group delimiter=" ">
+          <text macro="contributors-short"/>
+          <text macro="date-reference"/>
+        </group>
+        <text macro="point-locators"/>
       </group>
     </layout>
   </citation>
-  <bibliography  et-al-min="6" et-al-use-first="3" subsequent-author-substitute=""  entry-spacing="0">
+  <bibliography et-al-min="6" et-al-use-first="3" subsequent-author-substitute="" entry-spacing="0">
     <sort>
       <key macro="contributors"/>
       <key variable="issued"/>
     </sort>
     <layout suffix=".">
       <group display="block">
-	<text macro="contributors"/>
+        <text macro="contributors"/>
       </group>
       <group display="left-margin">
-	<text macro="date-bibliography" prefix=" "/>
-	<date variable="original-date" prefix="[" suffix="]">
-	  <date-part name="year"/>
-	</date>
-      </group >
+        <text macro="date-bibliography" prefix=" "/>
+        <date variable="original-date" prefix="[" suffix="]">
+          <date-part name="year"/>
+        </date>
+      </group>
       <group display="right-inline">
-	<group delimiter=". ">	
-	  <text macro="title"/>
-	  <text macro="description"/>
-	  <text macro="secondary-contributors"/>
-	  <text macro="container-title"/>
-	  <text macro="edition"/>
-	  <text macro="container-contributors"/>
-	</group>
-	<text macro="locators-chapter"/>
-	<text macro="locators"/>
-	<text macro="collection-title" prefix=". "/>
-	<text macro="issue"/>
-	<text macro="locators-article"/>
-	<text macro="access" prefix=". "/>
+        <group delimiter=". ">
+          <text macro="title"/>
+          <text macro="description"/>
+          <text macro="secondary-contributors"/>
+          <text macro="container-title"/>
+          <text macro="edition"/>
+          <text macro="container-contributors"/>
+        </group>
+        <text macro="locators-chapter"/>
+        <text macro="locators"/>
+        <text macro="collection-title" prefix=". "/>
+        <text macro="issue"/>
+        <text macro="locators-article"/>
+        <text macro="access" prefix=". "/>
       </group>
     </layout>
   </bibliography>
diff --git a/aacr.csl b/aacr.csl
index 1dd682290d..6dffc221d7 100644
--- a/aacr.csl
+++ b/aacr.csl
@@ -1,121 +1,122 @@
 <?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">
-   <info>
-      <title>American Association for Cancer Research (AACR)</title>
-      <id>http://www.zotero.org/styles/aacr</id>
-      <link href="http://www.zotero.org/styles/aacr" rel="self"/>
-      <link href="http://www.zotero.org/styles/nlm" rel="template"/>
-      <link href="http://www.icmje.org/references_1print.html" rel="documentation"/>
-      <author>
-         <name>Maxime Rigo</name>
-         <email>lemaxx@gmail.com</email>
-      </author>
-      <contributor>
-         <name>Richard Karnesky</name>
-         <email>karnesky+zotero@gmail.com</email>
-         <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-      </contributor>
-      <contributor>
-         <name>Sebastian Karcher</name>
-      </contributor>
-      <category field="biology"/>
-      <category citation-format="numeric"/>
-      <updated>2009-08-30T01:48:49+00:00</updated>
-   </info>
-   <macro name="author">
-      <names variable="author" suffix=". ">
-         <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      </names>
-   </macro>
-   <macro name="editor">
-      <names variable="editor" suffix=", editor(s).">
-         <name sort-separator="" initialize-with="" name-as-sort-order="all" delimiter="," delimiter-precedes-last="always"/>
-      </names>
-   </macro>
-   <macro name="publisher">
-      <text variable="publisher-place" suffix=": "/>
-      <text variable="publisher" suffix="; "/>
-      <date variable="issued">
-         <date-part name="year" suffix="."/>
-      </date>
-   </macro>
-   <macro name="access">
-      <group delimiter="">
-         <group prefix="[" suffix="]" delimiter="">
-            <text term="cited" text-case="lowercase"/>
-            <date variable="accessed" suffix="">
-               <date-part name="year"/>
-               <date-part name="month" prefix="" form="short" strip-periods="true"/>
-               <date-part name="day" prefix=""/>
-            </date>
-         </group>
-         <group>
-            <text value="Available from: "/>
-            <text variable="URL"/>
-         </group>
+  <info>
+    <title>American Association for Cancer Research (AACR)</title>
+    <id>http://www.zotero.org/styles/aacr</id>
+    <link href="http://www.zotero.org/styles/aacr" rel="self"/>
+    <link href="http://www.zotero.org/styles/nlm" rel="template"/>
+    <link href="http://www.icmje.org/references_1print.html" rel="documentation"/>
+    <author>
+      <name>Maxime Rigo</name>
+      <email>lemaxx@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category field="biology"/>
+    <category citation-format="numeric"/>
+    <updated>2009-08-30T01:48:49+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="author">
+    <names variable="author" suffix=". ">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" suffix=", editor(s).">
+      <name sort-separator="" initialize-with="" name-as-sort-order="all" delimiter="," delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place" suffix=": "/>
+    <text variable="publisher" suffix="; "/>
+    <date variable="issued">
+      <date-part name="year" suffix="."/>
+    </date>
+  </macro>
+  <macro name="access">
+    <group delimiter="">
+      <group prefix="[" suffix="]" delimiter="">
+        <text term="cited" text-case="lowercase"/>
+        <date variable="accessed" suffix="">
+          <date-part name="year"/>
+          <date-part name="month" prefix="" form="short" strip-periods="true"/>
+          <date-part name="day" prefix=""/>
+        </date>
       </group>
-   </macro>
-   <macro name="title">
-      <group delimiter="">
-         <text variable="title"/>
-         <choose>
-            <if variable="URL">
-               <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
-            </if>
-         </choose>
+      <group>
+        <text value="Available from: "/>
+        <text variable="URL"/>
       </group>
-   </macro>
-   <macro name="edition">
+    </group>
+  </macro>
+  <macro name="title">
+    <group delimiter="">
+      <text variable="title"/>
       <choose>
-         <if is-numeric="edition">
-            <group delimiter="">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
-            </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
+        <if variable="URL">
+          <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+        </if>
       </choose>
-   </macro>
-   <citation collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
-      <layout>
-         <text variable="citation-number" suffix="."/>
-         <text macro="author"/>
-         <text macro="title" suffix=". "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <text macro="edition" prefix="" suffix=" "/>
-               <text macro="publisher" prefix=""/>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <group prefix="" suffix=".">
-                  <text term="in" suffix=":" text-case="capitalize-first"/>
-                  <text macro="editor"/>
-                  <text variable="container-title"/>
-               </group>
-               <text macro="publisher" prefix=""/>
-               <text variable="page" prefix=" p." suffix="."/>
-            </else-if>
-            <else>
-               <text variable="container-title" suffix=". " form="short"/>
-               <date variable="issued" suffix=";">
-                  <date-part name="year" suffix=""/>
-               </date>
-               <text variable="volume"/>
-               <text variable="issue" prefix="(" suffix="):"/>
-               <text variable="page" suffix="."/>
-            </else>
-         </choose>
-         <text macro="access"/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter="">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix="."/>
+      <text macro="author"/>
+      <text macro="title" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <text macro="edition" prefix="" suffix=" "/>
+          <text macro="publisher" prefix=""/>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group prefix="" suffix=".">
+            <text term="in" suffix=":" text-case="capitalize-first"/>
+            <text macro="editor"/>
+            <text variable="container-title"/>
+          </group>
+          <text macro="publisher" prefix=""/>
+          <text variable="page" prefix=" p." suffix="."/>
+        </else-if>
+        <else>
+          <text variable="container-title" suffix=". " form="short"/>
+          <date variable="issued" suffix=";">
+            <date-part name="year" suffix=""/>
+          </date>
+          <text variable="volume"/>
+          <text variable="issue" prefix="(" suffix="):"/>
+          <text variable="page" suffix="."/>
+        </else>
+      </choose>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/acm-sigchi-proceedings.csl b/acm-sigchi-proceedings.csl
index bffa45a5ce..3807992f10 100644
--- a/acm-sigchi-proceedings.csl
+++ b/acm-sigchi-proceedings.csl
@@ -1,145 +1,146 @@
 <?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">
-   <info>
-      <title>ACM SIGCHI Conference Proceedings</title>
-      <id>http://www.zotero.org/styles/acm-sigchi-proceedings</id>
-      <link href="http://www.zotero.org/styles/acm-sigchi-proceedings" rel="self"/>
-      <link href="http://www.chi2009.org/Authors/Guides/Formatting.html" rel="documentation"/>
-      <author>
-         <name>Yevgeniy Medynskiy</name>
-         <email>eugenem@gatech.edu</email>
-      </author>
-      <contributor>
-         <name>Eric Baumer</name>
-         <email>ebaumer@ics.uci.edu</email>
-      </contributor>
-      <contributor>
-         <name>Svetlana Yarosh</name>
-         <email>lana@cc.gatech.edu</email>
-      </contributor>
-      <contributor>
-         <name>Lilly Irani</name>
-         <email>lirani@ics.uci.edu</email>
-      </contributor>
-      <category field="engineering"/>
-      <category citation-format="numeric"/>
-      <updated>2010-09-08T06:21:30+00:00</updated>
-   </info>
-   <macro name="author">
-      <group suffix=".">
-         <names variable="author">
-            <name initialize-with="." delimiter=", " and="text" name-as-sort-order="all" sort-separator=", "/>
-            <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
-            <substitute>
-               <names variable="editor"/>
-            </substitute>
-         </names>
-      </group>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name initialize-with="." delimiter=", " and="text" delimiter-precedes-last="never"/>
-         <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+  <info>
+    <title>ACM SIGCHI Conference Proceedings</title>
+    <id>http://www.zotero.org/styles/acm-sigchi-proceedings</id>
+    <link href="http://www.zotero.org/styles/acm-sigchi-proceedings" rel="self"/>
+    <link href="http://www.chi2009.org/Authors/Guides/Formatting.html" rel="documentation"/>
+    <author>
+      <name>Yevgeniy Medynskiy</name>
+      <email>eugenem@gatech.edu</email>
+    </author>
+    <contributor>
+      <name>Eric Baumer</name>
+      <email>ebaumer@ics.uci.edu</email>
+    </contributor>
+    <contributor>
+      <name>Svetlana Yarosh</name>
+      <email>lana@cc.gatech.edu</email>
+    </contributor>
+    <contributor>
+      <name>Lilly Irani</name>
+      <email>lirani@ics.uci.edu</email>
+    </contributor>
+    <category field="engineering"/>
+    <category citation-format="numeric"/>
+    <updated>2010-09-08T06:21:30+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+        <name initialize-with="." delimiter=", " and="text" name-as-sort-order="all" sort-separator=", "/>
+        <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
+        <substitute>
+          <names variable="editor"/>
+        </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" quotes="false"/>
-         </if>
-         <else>
-            <text variable="title" quotes="false"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="year">
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="journal">
-      <group suffix=", " delimiter=" " font-style="italic">
-         <text variable="container-title"/>
-         <text variable="volume"/>
-      </group>
+    </group>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with="." delimiter=", " and="text" delimiter-precedes-last="never"/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+    </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" quotes="false"/>
+      </if>
+      <else>
+        <text variable="title" quotes="false"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="journal">
+    <group suffix=", " delimiter=" " font-style="italic">
+      <text variable="container-title"/>
+      <text variable="volume"/>
+    </group>
+    <group delimiter=" ">
+      <text variable="issue"/>
+      <text macro="year" prefix="(" suffix=")"/>
+    </group>
+  </macro>
+  <macro name="conference">
+    <group delimiter=", ">
+      <text variable="container-title" font-style="italic"/>
       <group delimiter=" ">
-         <text variable="issue"/>
-         <text macro="year" prefix="(" suffix=")"/>
+        <text variable="publisher"/>
+        <text macro="year" prefix="(" suffix=")"/>
       </group>
-   </macro>
-   <macro name="conference">
-      <group delimiter=", ">
-         <text variable="container-title" font-style="italic"/>
-         <group delimiter=" ">
-            <text variable="publisher"/>
-            <text macro="year" prefix="(" suffix=")"/>
-         </group>
+    </group>
+  </macro>
+  <macro name="book-publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+      <text macro="year"/>
+    </group>
+  </macro>
+  <citation>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <group delimiter=":">
+        <text variable="citation-number"/>
+        <text variable="locator"/>
       </group>
-   </macro>
-   <macro name="book-publisher">
-      <group delimiter=", ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
-         <text macro="year"/>
-      </group>
-   </macro>
-   <citation>
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout prefix="[" suffix="]" delimiter=",">
-         <group delimiter=":">
-            <text variable="citation-number"/>
-            <text variable="locator"/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
-      <sort>
-         <key macro="author"/>
-         <key variable="issued"/>
-      </sort>
-      <layout suffix=".">
-         <text variable="citation-number" suffix="."/>
-         <text macro="author" suffix=". "/>
-         <text macro="title" suffix=". "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <text macro="book-publisher" suffix="."/>
-            </if>
-            <else-if type="paper-conference">
-               <group suffix="." delimiter=", ">
-                  <text macro="conference"/>
-                  <text variable="page"/>
-               </group>
-            </else-if>
-            <else-if type="chapter paper-conference" match="any">
-               <text term="in" text-case="capitalize-first" suffix=" "/>
-               <text macro="editor" suffix=", "/>
-               <text variable="container-title" font-style="italic" suffix=". "/>
-               <group suffix="." delimiter=", ">
-                  <text macro="book-publisher"/>
-                  <text variable="page"/>
-               </group>
-            </else-if>
-            <else-if type="article-journal">
-               <group suffix="." delimiter=", ">
-                  <text macro="journal"/>
-                  <text variable="page"/>
-               </group>
-            </else-if>
-            <else>
-               <group suffix="." delimiter=", ">
-                  <group delimiter=" " font-style="italic">
-                     <text variable="container-title"/>
-                     <text variable="volume"/>
-                  </group>
-                  <text macro="year"/>
-                  <text variable="page"/>
-               </group>
-               <text variable="URL" prefix=" "/>
-            </else>
-         </choose>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <text macro="author" suffix=". "/>
+      <text macro="title" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <text macro="book-publisher" suffix="."/>
+        </if>
+        <else-if type="paper-conference">
+          <group suffix="." delimiter=", ">
+            <text macro="conference"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <text term="in" text-case="capitalize-first" suffix=" "/>
+          <text macro="editor" suffix=", "/>
+          <text variable="container-title" font-style="italic" suffix=". "/>
+          <group suffix="." delimiter=", ">
+            <text macro="book-publisher"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else-if type="article-journal">
+          <group suffix="." delimiter=", ">
+            <text macro="journal"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix="." delimiter=", ">
+            <group delimiter=" " font-style="italic">
+              <text variable="container-title"/>
+              <text variable="volume"/>
+            </group>
+            <text macro="year"/>
+            <text variable="page"/>
+          </group>
+          <text variable="URL" prefix=" "/>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/american-journal-of-archaeology.csl b/american-journal-of-archaeology.csl
index 6955ba65ba..654d36650c 100644
--- a/american-journal-of-archaeology.csl
+++ b/american-journal-of-archaeology.csl
@@ -1,362 +1,363 @@
 <?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">
-   <info>
-      <title>American Journal of Archaeology</title>
-      <id>http://www.zotero.org/styles/american-journal-of-archaeology</id>
-      <link href="http://www.zotero.org/styles/american-journal-of-archaeology" rel="self"/>
-      <author>
-         <name>Konstantinos Kopanias</name>
-         <email>kkopanias@gmx.de</email>
-      </author>
-      <category citation-format="author-date"/>
-      <category field="anthropology"/>
-      <updated/>
-      <summary>The American Journal of Archaeology style</summary>
-      <link href="http://www.ajaonline.org/submissions#4" rel="documentation"/>
-   </info>
-   <macro name="secondary-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="none">
-            <group delimiter=". ">
-               <choose>
-                  <if variable="author">
-                     <names variable="editor">
-                        <label form="verb-short" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                        <name and="text" delimiter=", "/>
-                     </names>
-                  </if>
-               </choose>
-               <choose>
-                  <if variable="author editor" match="any">
-                     <names variable="translator">
-                        <label form="verb" text-case="capitalize-first" suffix=" "/>
-                        <name and="text" delimiter=", "/>
-                     </names>
-                  </if>
-               </choose>
-            </group>
-         </if>
-      </choose>
-   </macro>
-   <macro name="container-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <group prefix="," delimiter=", ">
-               <choose>
-                  <if variable="author">
-                     <text value="edited by" prefix=" " suffix=""/>
-                     <names variable="editor">
-                        <name and="text" delimiter=", "/>
-                     </names>
-                  </if>
-               </choose>
-               <choose>
-                  <if variable="author editor" match="any">
-                     <names variable="translator">
-                        <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
-                        <name and="text" delimiter=", "/>
-                     </names>
-                  </if>
-               </choose>
-            </group>
-         </if>
-      </choose>
-   </macro>
-   <macro name="anon">
-      <choose>
-         <if variable="author editor translator" match="none">
-            <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
-         </if>
-      </choose>
-   </macro>
-   <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="." strip-periods="true"/>
-      </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="." strip-periods="true"/>
-      </names>
-   </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>
-      <names variable="recipient" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="contributors">
-      <names variable="author">
-         <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
-         <substitute>
-            <text macro="editor"/>
-            <text macro="translator"/>
-         </substitute>
-      </names>
-      <text macro="anon"/>
-      <text macro="recipient"/>
-   </macro>
-   <macro name="contributors-short">
-      <names variable="author">
-         <name form="short" and="text" delimiter=", "/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-         </substitute>
-      </names>
-      <text macro="anon"/>
-   </macro>
-   <macro name="interviewer">
-      <names variable="interviewer" delimiter=", ">
-         <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </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="access">
-      <group delimiter=". ">
-         <choose>
-            <if type="graphic report" match="any">
-               <text macro="archive"/>
+  <info>
+    <title>American Journal of Archaeology</title>
+    <id>http://www.zotero.org/styles/american-journal-of-archaeology</id>
+    <link href="http://www.zotero.org/styles/american-journal-of-archaeology" rel="self"/>
+    <author>
+      <name>Konstantinos Kopanias</name>
+      <email>kkopanias@gmx.de</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="anthropology"/>
+    <updated/>
+    <summary>The American Journal of Archaeology style</summary>
+    <link href="http://www.ajaonline.org/submissions#4" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <group delimiter=". ">
+          <choose>
+            <if variable="author">
+              <names variable="editor">
+                <label form="verb-short" prefix=" " text-case="capitalize-first" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
+              </names>
             </if>
-            <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
-               <text macro="archive"/>
-            </else-if>
-         </choose>
-         <text variable="DOI" prefix="doi:"/>
-         <text variable="URL"/>
-      </group>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if variable="title" match="none">
-            <choose>
-               <if type="personal_communication" match="none">
-                  <text variable="genre" text-case="capitalize-first"/>
-               </if>
-            </choose>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-         </else-if>
-         <else>
-            <text variable="title" prefix="" suffix=". " quotes="true"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="edition">
+          </choose>
+          <choose>
+            <if variable="author editor" match="any">
+              <names variable="translator">
+                <label form="verb" text-case="capitalize-first" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group prefix="," delimiter=", ">
+          <choose>
+            <if variable="author">
+              <text value="edited by" prefix=" " suffix=""/>
+              <names variable="editor">
+                <name and="text" delimiter=", "/>
+              </names>
+            </if>
+          </choose>
+          <choose>
+            <if variable="author editor" match="any">
+              <names variable="translator">
+                <label form="verb-short" prefix=" " text-case="lowercase" suffix=". " strip-periods="true"/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="anon">
+    <choose>
+      <if variable="author editor translator" match="none">
+        <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true"/>
+      </if>
+    </choose>
+  </macro>
+  <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="." strip-periods="true"/>
+    </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="." strip-periods="true"/>
+    </names>
+  </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>
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="verb-short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
+      <substitute>
+        <text macro="editor"/>
+        <text macro="translator"/>
+      </substitute>
+    </names>
+    <text macro="anon"/>
+    <text macro="recipient"/>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="anon"/>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </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="access">
+    <group delimiter=". ">
       <choose>
-         <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <choose>
-               <if is-numeric="edition">
-                  <group delimiter=" ">
-                     <number variable="edition" form="ordinal"/>
-                     <text term="edition" form="short" suffix="." strip-periods="true"/>
-                  </group>
-               </if>
-               <else>
-                  <text variable="edition" suffix="."/>
-               </else>
-            </choose>
-         </if>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
       </choose>
-   </macro>
-   <macro name="locators">
-      <choose>
-         <if type="article-journal">
-            <text variable="volume" prefix=" "/>
-            <text variable="issue" prefix=" "/>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <group prefix=". " delimiter=". ">
-               <group>
-                  <text term="volume" form="short" text-case="capitalize-first" suffix="." strip-periods="true"/>
-                  <text variable="volume" font-style="italic" form="short" prefix=" " suffix=""/>
-               </group>
-               <group>
-                  <number variable="number-of-volumes" form="numeric"/>
-                  <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
-               </group>
-            </group>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="locators-chapter">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <group prefix=", ">
-               <text variable="volume" suffix=":"/>
-               <text variable="page"/>
+      <text variable="DOI" prefix="doi:"/>
+      <text variable="URL"/>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" prefix="" suffix=". " quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" suffix="." strip-periods="true"/>
             </group>
-         </if>
-      </choose>
-   </macro>
-   <macro name="locators-article">
+          </if>
+          <else>
+            <text variable="edition" suffix="."/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <text variable="volume" prefix=" "/>
+        <text variable="issue" prefix=" "/>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix="." strip-periods="true"/>
+            <text variable="volume" font-style="italic" form="short" prefix=" " suffix=""/>
+          </group>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group prefix=", ">
+          <text variable="volume" suffix=":"/>
+          <text variable="page"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="edition" suffix=" "/>
+            <text term="edition" prefix=" "/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=". " strip-periods="true"/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <text variable="page" prefix=": "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <group>
       <choose>
-         <if type="article-newspaper">
-            <group prefix=", " delimiter=", ">
-               <group>
-                  <text variable="edition" suffix=" "/>
-                  <text term="edition" prefix=" "/>
-               </group>
-               <group>
-                  <text term="section" form="short" suffix=". " strip-periods="true"/>
-                  <text variable="section"/>
-               </group>
-            </group>
-         </if>
-         <else-if type="article-journal">
-            <text variable="page" prefix=": "/>
-         </else-if>
+        <if locator="page" match="none">
+          <label variable="locator" form="short" suffix=" "/>
+        </if>
       </choose>
-   </macro>
-   <macro name="point-locators">
-      <group>
-         <choose>
-            <if locator="page" match="none">
-               <label variable="locator" form="short" suffix=" "/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="container-prefix">
+    <text term="in" text-case="capitalize-first"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <text variable="container-title" font-style="italic"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="collection-title">
+    <text variable="collection-title"/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <group delimiter=". ">
+      <text macro="interviewer"/>
+      <text variable="medium" text-case="capitalize-first"/>
+    </group>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis"/>
+      <else>
+        <text variable="genre" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="article-journal">
+        <text macro="day-month" prefix=" (" suffix=")"/>
+      </if>
+      <else-if type="speech">
+        <group prefix=" " delimiter=", ">
+          <text macro="event"/>
+          <text macro="day-month"/>
+          <text variable="event-place"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text macro="day-month" prefix=", "/>
+      </else-if>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
             </if>
-         </choose>
-         <text variable="locator"/>
-      </group>
-   </macro>
-   <macro name="container-prefix">
-      <text term="in" text-case="capitalize-first"/>
-   </macro>
-   <macro name="container-title">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <text macro="container-prefix" suffix=" "/>
-         </if>
-      </choose>
-      <text variable="container-title" font-style="italic"/>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=": ">
-         <text variable="publisher-place"/>
-         <text variable="publisher"/>
-      </group>
-   </macro>
-   <macro name="date">
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="day-month">
-      <date variable="issued">
-         <date-part name="month"/>
-         <date-part name="day" prefix=" "/>
-      </date>
-   </macro>
-   <macro name="collection-title">
-      <text variable="collection-title"/>
-      <text variable="collection-number" prefix=" "/>
-   </macro>
-   <macro name="event">
-      <group>
-         <text term="presented at" suffix=" "/>
-         <text variable="event"/>
+          </choose>
+          <text macro="publisher"/>
+          <text macro="day-month"/>
+        </group>
+      </else>
+    </choose>
+  </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">
+    <sort>
+      <key variable="issued"/>
+      <key macro="contributors-short"/>
+    </sort>
+    <layout prefix="" suffix="" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="contributors-short"/>
+          <text macro="date"/>
+          <text macro="day-month" prefix=" (" suffix="), "/>
+        </group>
+        <text macro="point-locators"/>
       </group>
-   </macro>
-   <macro name="description">
-      <group delimiter=". ">
-         <text macro="interviewer"/>
-         <text variable="medium" text-case="capitalize-first"/>
-      </group>
-      <choose>
-         <if variable="title" match="none"/>
-         <else-if type="thesis"/>
-         <else>
-            <text variable="genre" text-case="capitalize-first" prefix=". "/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="issue">
-      <choose>
-         <if type="article-journal">
-            <text macro="day-month" prefix=" (" suffix=")"/>
-         </if>
-         <else-if type="speech">
-            <group prefix=" " delimiter=", ">
-               <text macro="event"/>
-               <text macro="day-month"/>
-               <text variable="event-place"/>
-            </group>
-         </else-if>
-         <else-if type="article-newspaper article-magazine" match="any">
-            <text macro="day-month" prefix=", "/>
-         </else-if>
-         <else>
-            <group prefix=". " delimiter=", ">
-               <choose>
-                  <if type="thesis">
-                     <text variable="genre" text-case="capitalize-first"/>
-                  </if>
-               </choose>
-               <text macro="publisher"/>
-               <text macro="day-month"/>
-            </group>
-         </else>
-      </choose>
-   </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">
-      <sort>
-         <key variable="issued"/>
-         <key macro="contributors-short"/>
-      </sort>
-      <layout prefix="" suffix="" delimiter="; ">
-         <group delimiter=", ">
-            <group delimiter=" ">
-               <text macro="contributors-short"/>
-               <text macro="date"/>
-               <text macro="day-month" prefix=" (" suffix="), "/>
-            </group>
-            <text macro="point-locators"/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="___" entry-spacing="0">
-      <sort>
-         <key macro="contributors"/>
-         <key variable="issued"/>
-      </sort>
-      <layout suffix=".">
-         <text macro="contributors" suffix=". "/>
-         <text macro="date" suffix=". "/>
-         <text macro="day-month" text-case="capitalize-first" suffix=". "/>
-         <text macro="title"/>
-         <text macro="description"/>
-         <text macro="secondary-contributors" prefix=". "/>
-         <text macro="container-title"/>
-         <text macro="container-contributors"/>
-         <text macro="locators-chapter"/>
-         <text macro="edition" prefix=". "/>
-         <text macro="locators"/>
-         <text macro="collection-title" prefix=". "/>
-         <text macro="issue"/>
-         <text macro="locators-article"/>
-         <text macro="access" prefix=". "/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="___" entry-spacing="0">
+    <sort>
+      <key macro="contributors"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="contributors" suffix=". "/>
+      <text macro="date" suffix=". "/>
+      <text macro="day-month" text-case="capitalize-first" suffix=". "/>
+      <text macro="title"/>
+      <text macro="description"/>
+      <text macro="secondary-contributors" prefix=". "/>
+      <text macro="container-title"/>
+      <text macro="container-contributors"/>
+      <text macro="locators-chapter"/>
+      <text macro="edition" prefix=". "/>
+      <text macro="locators"/>
+      <text macro="collection-title" prefix=". "/>
+      <text macro="issue"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/american-meteorological-society.csl b/american-meteorological-society.csl
index 39580f95bd..8fb74a4e5d 100644
--- a/american-meteorological-society.csl
+++ b/american-meteorological-society.csl
@@ -17,6 +17,7 @@
     <updated>2010-04-06T20:52:25+00:00</updated>
     <link href="http://www.ametsoc.org/pubs/journals/author_reference_guide.pdf" rel="documentation"/>
     <summary>A style for all journals by AMS, based on Cold Spring Harbor Laboratory Press</summary>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <!-- Needs delimiter-precedes-et-al="never" (scheduled for CSL 1.0.1) before "and others" et-al term -->
   <locale xml:lang="en">
@@ -241,4 +242,4 @@
       <text prefix=" " macro="access" suffix="."/>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/australian-historical-studies.csl b/australian-historical-studies.csl
index 255d818f9b..246e591b34 100644
--- a/australian-historical-studies.csl
+++ b/australian-historical-studies.csl
@@ -1,379 +1,380 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>Australian Historical Studies</title>
-      <id>http://www.zotero.org/styles/australian-historical-studies</id>
-      <link href="http://www.zotero.org/styles/australian-historical-studies" rel="self"/>
-      <link href="http://www.tandf.co.uk/journals/journal.asp?issn=1031-461X&amp;linktype=44" rel="documentation"/>
-      <author>
-         <name>Julian Onions</name>
-         <email>julian.onions@gmail.com</email>
-      </author>
-      <contributor>
-         <name>Simon Kornblith</name>
-         <email>simon@simonster.com</email>
-      </contributor>
-      <contributor>
-         <name>Elena Razlogova</name>
-         <email>elena.razlogova@gmail.com</email>
-      </contributor>
-      <contributor>
-         <name>Tim Sherratt</name>
-         <email>tim@discontents.com.au</email>
-      </contributor>
-      <summary>Chicago format with full notes, no bibliography and single quotes</summary>
-      <category citation-format="note"/>
-      <updated>2008-05-13T12:42:52+00:00</updated>
-   </info>
-   <macro name="editor-translator">
-      <group delimiter=", ">
-         <names variable="editor" delimiter=", ">
-            <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
-            <name and="text" delimiter=", "/>
-         </names>
-         <choose>
-            <if variable="author editor" match="any">
-               <names variable="translator" delimiter=", ">
-                  <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
-                  <name and="text" delimiter=", "/>
-               </names>
-            </if>
-         </choose>
-      </group>
-   </macro>
-   <macro name="secondary-contributors-note">
-      <choose>
-         <if type="chapter paper-conference" match="none">
-            <text macro="editor-translator"/>
-         </if>
-      </choose>
-   </macro>
-   <macro name="container-contributors-note">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <text macro="editor-translator"/>
-         </if>
-      </choose>
-   </macro>
-   <macro name="editor-note">
-      <names variable="editor">
-         <name and="text" sort-separator=", " delimiter=", "/>
-         <label form="short" prefix=", " suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="translator-note">
-      <names variable="translator">
-         <name and="text" sort-separator=", " delimiter=", "/>
-         <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="recipient-note">
-      <names variable="recipient" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
+  <info>
+    <title>Australian Historical Studies</title>
+    <id>http://www.zotero.org/styles/australian-historical-studies</id>
+    <link href="http://www.zotero.org/styles/australian-historical-studies" rel="self"/>
+    <link href="http://www.tandf.co.uk/journals/journal.asp?issn=1031-461X&amp;linktype=44" rel="documentation"/>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email>
+    </contributor>
+    <contributor>
+      <name>Elena Razlogova</name>
+      <email>elena.razlogova@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Tim Sherratt</name>
+      <email>tim@discontents.com.au</email>
+    </contributor>
+    <summary>Chicago format with full notes, no bibliography and single quotes</summary>
+    <category citation-format="note"/>
+    <updated>2008-05-13T12:42:52+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <names variable="editor" delimiter=", ">
+        <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
+        <name and="text" delimiter=", "/>
       </names>
-   </macro>
-   <macro name="contributors-note">
-      <names variable="author">
-         <name and="text" sort-separator=", " delimiter=", "/>
-         <substitute>
-            <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=", "/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-         </substitute>
-      </names>
-      <text macro="recipient-short"/>
-   </macro>
-   <macro name="interviewer-note">
-      <names variable="interviewer" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="title-note">
       <choose>
-         <if variable="title" match="none">
-            <text variable="genre"/>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-         </else-if>
-         <else>
-            <text variable="title" prefix="‘" suffix="’"/>
-         </else>
+        <if variable="author editor" match="any">
+          <names variable="translator" delimiter=", ">
+            <label form="verb-short" text-case="lowercase" suffix=". " strip-periods="true"/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </if>
       </choose>
-   </macro>
-   <macro name="title-short">
+    </group>
+  </macro>
+  <macro name="secondary-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="editor-note">
+    <names variable="editor">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <label form="short" prefix=", " suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="translator-note">
+    <names variable="translator">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-note">
+    <names variable="author">
+      <name and="text" sort-separator=", " delimiter=", "/>
+      <substitute>
+        <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=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short"/>
+  </macro>
+  <macro name="interviewer-note">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if variable="title" match="none">
+        <text variable="genre"/>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" prefix="‘" suffix="’"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="interview">
+            <text term="interview" text-case="lowercase"/>
+          </if>
+          <else-if type="manuscript speech" match="any">
+            <text variable="genre" form="short"/>
+          </else-if>
+          <else-if type="personal_communication">
+            <text macro="issued"/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title" form="short" prefix="‘" suffix="’"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="description-note">
+    <group delimiter=", ">
+      <text macro="interviewer-note"/>
+      <text variable="medium"/>
       <choose>
-         <if variable="title" match="none">
-            <choose>
-               <if type="interview">
-                  <text term="interview" text-case="lowercase"/>
-               </if>
-               <else-if type="manuscript speech" match="any">
-                  <text variable="genre" form="short"/>
-               </else-if>
-               <else-if type="personal_communication">
-                  <text macro="issued"/>
-               </else-if>
-            </choose>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" form="short" font-style="italic"/>
-         </else-if>
-         <else>
-            <text variable="title" form="short" prefix="‘" suffix="’"/>
-         </else>
+        <if variable="title" match="none"/>
+        <else-if type="thesis speech" match="any"/>
+        <else>
+          <text variable="genre"/>
+        </else>
       </choose>
-   </macro>
-   <macro name="description-note">
-      <group delimiter=", ">
-         <text macro="interviewer-note"/>
-         <text variable="medium"/>
-         <choose>
-            <if variable="title" match="none"/>
-            <else-if type="thesis speech" match="any"/>
-            <else>
-               <text variable="genre"/>
-            </else>
-         </choose>
-      </group>
-   </macro>
-   <macro name="container-title-note">
+    </group>
+  </macro>
+  <macro name="container-title-note">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="lowercase" suffix=" "/>
+      </if>
+    </choose>
+    <text variable="container-title" font-style="italic"/>
+  </macro>
+  <macro name="edition-note">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" suffix="." strip-periods="true"/>
+            </group>
+          </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" prefix=" "/>
+        <text variable="issue" prefix=", no. "/>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text term="volume" form="short" suffix=". " strip-periods="true"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <choose>
+            <if variable="locator" match="none">
+              <group>
+                <number variable="number-of-volumes" form="numeric"/>
+                <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
+              </group>
+            </if>
+          </choose>
+          <text macro="edition-note"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group>
+            <text variable="edition" suffix=" "/>
+            <text term="edition" prefix=" "/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=". " strip-periods="true"/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="graphic report" match="any">
+        <date variable="issued">
+          <date-part name="month" suffix=" "/>
+          <date-part name="day" suffix=", "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else>
+        <date variable="issued">
+          <date-part name="month" suffix=" "/>
+          <date-part name="day" suffix=", "/>
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal">
+        <text variable="page" prefix=": "/>
+      </if>
+      <else-if type="chapter paper-conference" match="any">
+        <text variable="page" prefix=", "/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators-subsequent">
+    <group>
       <choose>
-         <if type="chapter paper-conference" match="any">
-            <text term="in" text-case="lowercase" suffix=" "/>
-         </if>
+        <if locator="page" match="none">
+          <label variable="locator" form="short" suffix=" "/>
+        </if>
       </choose>
-      <text variable="container-title" font-style="italic"/>
-   </macro>
-   <macro name="edition-note">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator" match="none">
+        <text macro="pages"/>
+      </if>
+      <else-if type="article-journal">
+        <text variable="locator" prefix=": "/>
+      </else-if>
+      <else>
+        <text macro="point-locators-subsequent" prefix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="archive-note">
+    <group delimiter=", ">
+      <text variable="archive_location"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="article-journal">
+        <text macro="issued" prefix=" (" suffix=")"/>
+      </if>
+      <else-if variable="publisher-place publisher" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <group delimiter=" ">
             <choose>
-               <if is-numeric="edition">
-                  <group delimiter=" ">
-                     <number variable="edition" form="ordinal"/>
-                     <text term="edition" form="short" suffix="." strip-periods="true"/>
-                  </group>
-               </if>
-               <else>
-                  <text variable="edition" suffix="."/>
-               </else>
+              <if variable="title" match="none"/>
+              <else-if type="thesis speech" match="any">
+                <text variable="genre"/>
+              </else-if>
             </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" prefix=" "/>
-            <text variable="issue" prefix=", no. "/>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <group prefix=", " delimiter=", ">
-               <group>
-                  <text term="volume" form="short" suffix=". " strip-periods="true"/>
-                  <number variable="volume" form="numeric"/>
-               </group>
-               <choose>
-                  <if variable="locator" match="none">
-                     <group>
-                        <number variable="number-of-volumes" form="numeric"/>
-                        <text term="volume" form="short" prefix=" " suffix="." plural="true" strip-periods="true"/>
-                     </group>
-                  </if>
-               </choose>
-               <text macro="edition-note"/>
-            </group>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="locators-newspaper">
-      <choose>
-         <if type="article-newspaper">
-            <group delimiter=", ">
-               <group>
-                  <text variable="edition" suffix=" "/>
-                  <text term="edition" prefix=" "/>
-               </group>
-               <group>
-                  <text term="section" form="short" suffix=". " strip-periods="true"/>
-                  <text variable="section"/>
-               </group>
-            </group>
-         </if>
-      </choose>
-   </macro>
-   <macro name="event">
-      <group>
-         <text term="presented at" suffix=" "/>
-         <text variable="event"/>
-      </group>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=": ">
-         <text variable="publisher-place"/>
-         <text variable="publisher"/>
-      </group>
-   </macro>
-   <macro name="issued">
+            <text macro="event"/>
+          </group>
+          <text macro="publisher"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued" prefix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
       <choose>
-         <if type="graphic report" match="any">
-            <date variable="issued">
-               <date-part name="month" suffix=" "/>
-               <date-part name="day" suffix=", "/>
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </else-if>
-         <else>
-            <date variable="issued">
-               <date-part name="month" suffix=" "/>
-               <date-part name="day" suffix=", "/>
-               <date-part name="year"/>
-            </date>
-         </else>
+        <if type="graphic report" match="any">
+          <text macro="archive-note"/>
+        </if>
+        <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
+          <text macro="archive-note"/>
+        </else-if>
       </choose>
-   </macro>
-   <macro name="pages">
+      <text variable="DOI" prefix="doi:"/>
+      <text variable="URL"/>
+    </group>
+  </macro>
+  <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" disambiguate-add-givenname="true">
+    <layout prefix="" suffix="." delimiter="; ">
       <choose>
-         <if type="article-journal">
-            <text variable="page" prefix=": "/>
-         </if>
-         <else-if type="chapter paper-conference" match="any">
-            <text variable="page" prefix=", "/>
-         </else-if>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" text-case="capitalize-first"/>
+            <text macro="point-locators-subsequent"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" text-case="capitalize-first"/>
+        </else-if>
+        <else-if position="subsequent">
+          <group delimiter=", ">
+            <text macro="contributors-short"/>
+            <text macro="title-short"/>
+            <text macro="point-locators-subsequent"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="contributors-note"/>
+            <text macro="title-note"/>
+            <text macro="description-note"/>
+            <text macro="secondary-contributors-note"/>
+            <text macro="container-title-note"/>
+            <text macro="container-contributors-note"/>
+          </group>
+          <text macro="locators-note"/>
+          <text macro="collection-title" prefix=", "/>
+          <text macro="issue-note"/>
+          <text macro="locators-newspaper" prefix=", "/>
+          <text macro="point-locators"/>
+          <text macro="access-note" prefix=", "/>
+        </else>
       </choose>
-   </macro>
-   <macro name="point-locators-subsequent">
-      <group>
-         <choose>
-            <if locator="page" match="none">
-               <label variable="locator" form="short" suffix=" "/>
-            </if>
-         </choose>
-         <text variable="locator"/>
-      </group>
-   </macro>
-   <macro name="point-locators">
-      <choose>
-         <if variable="locator" match="none">
-            <text macro="pages"/>
-         </if>
-         <else-if type="article-journal">
-            <text variable="locator" prefix=": "/>
-         </else-if>
-         <else>
-            <text macro="point-locators-subsequent" prefix=", "/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="archive-note">
-      <group delimiter=", ">
-         <text variable="archive_location"/>
-         <text variable="archive"/>
-         <text variable="archive-place"/>
-      </group>
-   </macro>
-   <macro name="issue-note">
-      <choose>
-         <if type="article-journal">
-            <text macro="issued" prefix=" (" suffix=")"/>
-         </if>
-         <else-if variable="publisher-place publisher" match="any">
-            <group prefix=" (" suffix=")" delimiter=", ">
-               <group delimiter=" ">
-                  <choose>
-                     <if variable="title" match="none"/>
-                     <else-if type="thesis speech" match="any">
-                        <text variable="genre"/>
-                     </else-if>
-                  </choose>
-                  <text macro="event"/>
-               </group>
-               <text macro="publisher"/>
-               <text macro="issued"/>
-            </group>
-         </else-if>
-         <else>
-            <text macro="issued" prefix=", "/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="access-note">
-      <group delimiter=", ">
-         <choose>
-            <if type="graphic report" match="any">
-               <text macro="archive-note"/>
-            </if>
-            <else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
-               <text macro="archive-note"/>
-            </else-if>
-         </choose>
-         <text variable="DOI" prefix="doi:"/>
-         <text variable="URL"/>
-      </group>
-   </macro>
-   <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" disambiguate-add-givenname="true">
-      <layout prefix="" suffix="." delimiter="; ">
-         <choose>
-            <if position="ibid-with-locator">
-               <group delimiter=", ">
-                  <text term="ibid" text-case="capitalize-first"/>
-                  <text macro="point-locators-subsequent"/>
-               </group>
-            </if>
-            <else-if position="ibid">
-               <text term="ibid" text-case="capitalize-first"/>
-            </else-if>
-            <else-if position="subsequent">
-               <group delimiter=", ">
-                  <text macro="contributors-short"/>
-                  <text macro="title-short"/>
-                  <text macro="point-locators-subsequent"/>
-               </group>
-            </else-if>
-            <else>
-               <group delimiter=", ">
-                  <text macro="contributors-note"/>
-                  <text macro="title-note"/>
-                  <text macro="description-note"/>
-                  <text macro="secondary-contributors-note"/>
-                  <text macro="container-title-note"/>
-                  <text macro="container-contributors-note"/>
-               </group>
-               <text macro="locators-note"/>
-               <text macro="collection-title" prefix=", "/>
-               <text macro="issue-note"/>
-               <text macro="locators-newspaper" prefix=", "/>
-               <text macro="point-locators"/>
-               <text macro="access-note" prefix=", "/>
-            </else>
-         </choose>
-      </layout>
-   </citation>
-</style>
\ No newline at end of file
+    </layout>
+  </citation>
+</style>
diff --git a/australian-legal.csl b/australian-legal.csl
index 7df4ecf353..8329501ec5 100644
--- a/australian-legal.csl
+++ b/australian-legal.csl
@@ -1,152 +1,167 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>Australian Legal Citation</title>
-      <id>http://www.zotero.org/styles/australian-legal</id>
-      <link href="http://www.zotero.org/styles/australian-legal" rel="self"/>
-      <author>
-         <name>Anton Hughes</name>
-         <email>antonh@lawtec.net</email>
-      </author>
-      <author>
-         <name>Bruce D'Arcus</name>
-         <email>bdarcus@gmail.com</email>
-      </author>
-      <author>
-         <name>Nancy Sims</name>
-         <email>nsims@umich.edu</email>
-      </author>
-      <author>
-         <name>Nic Suzor</name>
-         <email>nic@suzor.com</email>
-      </author>
-      <category citation-format="note"/>
-      <updated>2010-01-12T14:05:00+10:00</updated>
-      <summary>A modification of the Bluebook legal citation style for Australian conditions.</summary>
-   </info><!-- sets up basics of dealing with authors -->
-   <macro name="name-macro">
-      <choose>
-         <if type="legal_case">
-            <names variable="author">
-               <name and="symbol" delimiter="" delimiter-precedes-last="never"/>
-               <label form="short" prefix="" suffix="." strip-periods="true"/>
-               <substitute>
-                  <text variable="title"/>
-               </substitute>
-            </names>
-         </if>
-         <else-if variable="author" match="none"><!-- no author, get the editors; editors go before the title: AGLC 5.1.2 -->
-            <names variable="editor translator">
-               <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
-               <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
-               <substitute><!-- no editors, just get the title -->
-                  <text variable="title"/>
-               </substitute>
-            </names>
-         </else-if>
-         <else>
-            <names variable="author">
-               <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
-               <label form="short" prefix=" " suffix="." strip-periods="true"/>
-            </names>
-         </else>
-      </choose>
-   </macro>
-   <macro name="author-short">
-      <names variable="author">
-         <name form="short" and="text" delimiter=", "/>
-         <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="author">
-      <choose>
-         <if type="legal_case">
-            <text macro="name-macro" font-style="italic"/>
-         </if>
-         <else-if type="interview">
-            <names variable="author">
-               <name and="symbol" delimiter=", "/>
-               <label form="short" prefix=" Interview with " suffix="" strip-periods="true"/>
-               <substitute>
-                  <text variable="title"/>
-               </substitute>
-            </names>
-         </else-if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text macro="name-macro"/>
-         </else-if>
-         <else>
-            <text macro="name-macro"/>
-         </else>
-      </choose>
-   </macro><!-- sets up basics of dealing with editors and translators. Will generally only show up in book citations, as called in XXXX, below -->
-   <macro name="editor"><!-- AGLC 5.1.2 -->
-      <names variable="editor" prefix="" suffix="" delimiter=",">
-         <name and="symbol" delimiter=", "/>
-         <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="editor-translator"><!-- deprecated -->
-      <choose>
-         <if variable="author" match="none"><!-- if there's no author, do nothing, as we should have added the editors in before the title --></if>
-         <else>
-            <names variable="editor translator" prefix="" suffix=" " delimiter=", ">
-               <name and="symbol" delimiter=", "/>
-               <label form="short" prefix=" " suffix=".," strip-periods="true"/>
-            </names>
-         </else>
-      </choose>
-   </macro>
-   <macro name="translator"><!--AGLC 5.6 -->
-      <names variable="translator" prefix="" suffix="" delimiter=", ">
-         <name and="symbol" delimiter=", "/>
-         <label form="short" prefix=" " suffix=".," strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="interviewer">
-      <names variable="interviewer">
-         <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
-         <label form="short" prefix=" " suffix="." strip-periods="true"/>
-      </names>
-   </macro><!-- sets up basics of handling volume formatting -->
-   <macro name="volume-macro">
-      <choose>
-         <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage legal_case" match="any">
-            <choose>
-               <if variable="volume" match="none">
-                  <date variable="issued">
-                     <date-part name="year" prefix=" [" suffix="]"/>
-                  </date>
-                  <text variable="volume" prefix=" "/>
-               </if>
-               <else>
-                  <date variable="issued">
-                     <date-part name="year" prefix=" (" suffix=")"/>
-                  </date>
-                  <text variable="volume" prefix=" "/>
-                  <text variable="issue" prefix="(" suffix=")"/>
-               </else>
-            </choose>
-         </if>
-         <else>
-            <group prefix=" (" suffix=")" delimiter=" ">
-               <text variable="edition" suffix=", "/>
-               <text variable="publisher"/>
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
-            </group>
-         </else>
-      </choose>
-   </macro><!-- sets up font variations for titles in books, articles, etc. -->
-   <macro name="title">
-      <choose>
-         <if type="bill"><!-- Statutes should be italicised, bills should not. This test, however, doesn't work. For the moment, italicise everything. --><!--	<choose>
+  <info>
+    <title>Australian Legal Citation</title>
+    <id>http://www.zotero.org/styles/australian-legal</id>
+    <link href="http://www.zotero.org/styles/australian-legal" rel="self"/>
+    <author>
+      <name>Anton Hughes</name>
+      <email>antonh@lawtec.net</email>
+    </author>
+    <author>
+      <name>Bruce D'Arcus</name>
+      <email>bdarcus@gmail.com</email>
+    </author>
+    <author>
+      <name>Nancy Sims</name>
+      <email>nsims@umich.edu</email>
+    </author>
+    <author>
+      <name>Nic Suzor</name>
+      <email>nic@suzor.com</email>
+    </author>
+    <category citation-format="note"/>
+    <updated>2010-01-12T14:05:00+10:00</updated>
+    <summary>A modification of the Bluebook legal citation style for Australian conditions.</summary>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <!-- sets up basics of dealing with authors -->
+  <macro name="name-macro">
+    <choose>
+      <if type="legal_case">
+        <names variable="author">
+          <name and="symbol" delimiter="" delimiter-precedes-last="never"/>
+          <label form="short" prefix="" suffix="." strip-periods="true"/>
+          <substitute>
+            <text variable="title"/>
+          </substitute>
+        </names>
+      </if>
+      <else-if variable="author" match="none">
+        <!-- no author, get the editors; editors go before the title: AGLC 5.1.2 -->
+        <names variable="editor translator">
+          <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
+          <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+          <substitute>
+            <!-- no editors, just get the title -->
+            <text variable="title"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author">
+          <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
+          <label form="short" prefix=" " suffix="." strip-periods="true"/>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <label form="verb-short" prefix=", " suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="legal_case">
+        <text macro="name-macro" font-style="italic"/>
+      </if>
+      <else-if type="interview">
+        <names variable="author">
+          <name and="symbol" delimiter=", "/>
+          <label form="short" prefix=" Interview with " suffix="" strip-periods="true"/>
+          <substitute>
+            <text variable="title"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text macro="name-macro"/>
+      </else-if>
+      <else>
+        <text macro="name-macro"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- sets up basics of dealing with editors and translators. Will generally only show up in book citations, as called in XXXX, below -->
+  <macro name="editor">
+    <!-- AGLC 5.1.2 -->
+    <names variable="editor" prefix="" suffix="" delimiter=",">
+      <name and="symbol" delimiter=", "/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="editor-translator">
+    <!-- deprecated -->
+    <choose>
+      <if variable="author" match="none">
+        <!-- if there's no author, do nothing, as we should have added the editors in before the title -->
+      </if>
+      <else>
+        <names variable="editor translator" prefix="" suffix=" " delimiter=", ">
+          <name and="symbol" delimiter=", "/>
+          <label form="short" prefix=" " suffix=".," strip-periods="true"/>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="translator">
+    <!--AGLC 5.6 -->
+    <names variable="translator" prefix="" suffix="" delimiter=", ">
+      <name and="symbol" delimiter=", "/>
+      <label form="short" prefix=" " suffix=".," strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer">
+      <name and="symbol" delimiter=", " delimiter-precedes-last="never"/>
+      <label form="short" prefix=" " suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <!-- sets up basics of handling volume formatting -->
+  <macro name="volume-macro">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage legal_case" match="any">
+        <choose>
+          <if variable="volume" match="none">
+            <date variable="issued">
+              <date-part name="year" prefix=" [" suffix="]"/>
+            </date>
+            <text variable="volume" prefix=" "/>
+          </if>
+          <else>
+            <date variable="issued">
+              <date-part name="year" prefix=" (" suffix=")"/>
+            </date>
+            <text variable="volume" prefix=" "/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text variable="edition" suffix=", "/>
+          <text variable="publisher"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <!-- sets up font variations for titles in books, articles, etc. -->
+  <macro name="title">
+    <choose>
+      <if type="bill">
+        <!-- Statutes should be italicised, bills should not. This test, however, doesn't work. For the moment, italicise everything. -->
+        <!--	<choose>
 	  <if type="statute"> -->
-            <text variable="title" font-style="italic"/>
-            <date variable="issued" font-style="italic">
-               <date-part name="year" prefix=" "/>
-            </date><!--	  </if>
+        <text variable="title" font-style="italic"/>
+        <date variable="issued" font-style="italic">
+          <date-part name="year" prefix=" "/>
+        </date>
+        <!--	  </if>
 	  <else>
 	    <text variable="title" />
    	    <date variable="issued">
@@ -154,257 +169,293 @@
              </date>
 	  </else>
 	</choose>-->
-            <text variable="note" prefix=" (" suffix=")"/>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-         </else-if>
-         <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-            <text variable="title" quotes="true"/>
-         </else-if>
-         <else-if type="legal_case">
-            <text variable="title" font-style="italic"/>
-         </else-if>
-         <else>
-            <text variable="title"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="event"><!-- this handles a bunch of events in form "(<name of even>, <location>, <full date>)" -->
-      <group prefix="(" suffix=")"><!-- technically, this should have "Paper presented at the " or "Speech delivered at the", but that becomes too messy. -->
-         <text variable="event" suffix=", "/>
-         <text variable="event-place" suffix=", "/>
-         <date variable="issued">
+        <text variable="note" prefix=" (" suffix=")"/>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+        <text variable="title" quotes="true"/>
+      </else-if>
+      <else-if type="legal_case">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <!-- this handles a bunch of events in form "(<name of even>, <location>, <full date>)" -->
+    <group prefix="(" suffix=")">
+      <!-- technically, this should have "Paper presented at the " or "Speech delivered at the", but that becomes too messy. -->
+      <text variable="event" suffix=", "/>
+      <text variable="event-place" suffix=", "/>
+      <date variable="issued">
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" "/>
+        <date-part name="year"/>
+      </date>
+    </group>
+  </macro>
+  <!-- link to online content, called in YYYYY -->
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
+        <group prefix=" at " suffix="">
+          <!-- AGLC requires format "at 2 December 2001", no parentheses. -->
+          <date variable="accessed">
             <date-part name="day" suffix=" "/>
             <date-part name="month" suffix=" "/>
             <date-part name="year"/>
-         </date>
-      </group>
-   </macro><!-- link to online content, called in YYYYY -->
-   <macro name="access">
-      <choose>
-         <if variable="URL">
-            <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-            <group prefix=" at " suffix=""><!-- AGLC requires format "at 2 December 2001", no parentheses. -->
-               <date variable="accessed">
-                  <date-part name="day" suffix=" "/>
-                  <date-part name="month" suffix=" "/>
-                  <date-part name="year"/>
-               </date>
-            </group>
-         </if>
-      </choose>
-   </macro>
-   <macro name="source"><!-- This macro seems really problematic, with a ton of redundancy. I'd move some of 
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="source">
+    <!-- This macro seems really problematic, with a ton of redundancy. I'd move some of 
     the conditional logic into the appropriate macros (like 'title') and try to remove this 
     macro entirely. -->
-      <choose>
-         <if type="article-journal" match="any">
-            <text variable="title" suffix=" " quotes="true"/>
-            <text macro="volume-macro"/>
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="title" suffix=" " quotes="true"/>
+        <text macro="volume-macro"/>
+        <text macro="container"/>
+        <text variable="page" prefix=" "/>
+      </if>
+      <else-if type="legal_case">
+        <!-- I am using this to distinguish US cases from Australian ones; we don't list the court for Australian cases in AGLC -->
+        <choose>
+          <if variable="authority" match="none">
+            <text variable="title" font-style="italic"/>
+            <text macro="volume-macro" suffix=""/>
             <text macro="container"/>
             <text variable="page" prefix=" "/>
-         </if>
-         <else-if type="legal_case"><!-- I am using this to distinguish US cases from Australian ones; we don't list the court for Australian cases in AGLC -->
-            <choose>
-               <if variable="authority" match="none">
-                  <text variable="title" font-style="italic"/>
-                  <text macro="volume-macro" suffix=""/>
-                  <text macro="container"/>
-                  <text variable="page" prefix=" "/>
-                  <text variable="locator" prefix=", "/>
-               </if>
-               <else>
-                  <text variable="title" suffix=", " font-variant="normal"/>
-                  <text variable="volume" prefix=" " suffix=""/>
-                  <text macro="container"/>
-                  <text variable="page" prefix=" "/>
-                  <text variable="locator" prefix=", "/>
-                  <group prefix=" (" suffix=")">
-                     <text variable="authority" suffix=", "/>
-                     <date variable="issued">
-                        <date-part name="year"/>
-                     </date>
-                  </group>
-               </else>
-            </choose>
-         </else-if>
-         <else-if type="interview"><!-- AGLC 6.11 -->
-            <group prefix=" (" suffix=")">
-               <text variable="medium" suffix=", "/>
-               <date variable="issued">
-                  <date-part name="day" suffix=" "/>
-                  <date-part name="month" suffix=" "/><!--- DD mon YYYY -->
-                  <date-part name="year"/>
-               </date>
-            </group>
-         </else-if>
-         <else-if type="thesis"><!-- AGLC 6.7 -->
-            <text variable="title" font-style="italic"/>
+            <text variable="locator" prefix=", "/>
+          </if>
+          <else>
+            <text variable="title" suffix=", " font-variant="normal"/>
+            <text variable="volume" prefix=" " suffix=""/>
+            <text macro="container"/>
+            <text variable="page" prefix=" "/>
+            <text variable="locator" prefix=", "/>
             <group prefix=" (" suffix=")">
-               <text variable="genre" suffix=", "/>
-               <text variable="publisher" suffix=", "/>
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
+              <text variable="authority" suffix=", "/>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
             </group>
-         </else-if>
-         <else-if type="speech"><!-- AGLC 6.9, 6.10 for presentations, oral conference papers, speeches -->
-            <text variable="title" quotes="true"/>
-            <text macro="event" prefix=" "/>
-         </else-if>
-         <else-if type="article-newspaper article-magazine" match="any">
-            <text variable="title" suffix=", " quotes="true"/><!--AGLC 6.2 -->
-            <text variable="volume" suffix=" "/>
-            <text macro="container" suffix=", " font-style="italic"/>
-            <text macro="issuance"/>
-            <group delimiter="">
-               <text value="at" prefix=", "/>
-               <text variable="page" prefix=" "/>
-            </group>
-         </else-if>
-         <else-if type="chapter paper-conference" match="any">
-            <text variable="title" suffix=" " quotes="true"/><!-- AGLC 5.5, chapters in edited books -->
-            <text macro="container" suffix=" "/>
-            <text macro="issuance" prefix=" (" suffix=")"/>
-            <text variable="volume" prefix=" vol. " suffix=" "/>
-            <text variable="page" prefix=" "/>
-         </else-if>
-         <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic"/>
-            <text macro="container" prefix=" "/>
-            <text macro="issuance" prefix=" (" suffix=")"/>
-            <text variable="volume" prefix=" vol. " suffix=" "/>
-         </else-if>
-         <else-if type="webpage"><!-- AGLC 6.14 -->
-            <text variable="title" font-style="italic"/>
-            <text macro="issuance" prefix=" (" suffix=")"/>
-            <text macro="container" prefix=" "/>
-         </else-if>
-         <else>
-            <text variable="volume" suffix=" "/>
-            <text variable="title" quotes="true"/>
-            <text macro="container" prefix=" "/>
-            <text macro="issuance" prefix=" (" suffix=")"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="issuance">
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="interview">
+        <!-- AGLC 6.11 -->
+        <group prefix=" (" suffix=")">
+          <text variable="medium" suffix=", "/>
+          <date variable="issued">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month" suffix=" "/>
+            <!--- DD mon YYYY -->
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="thesis">
+        <!-- AGLC 6.7 -->
+        <text variable="title" font-style="italic"/>
+        <group prefix=" (" suffix=")">
+          <text variable="genre" suffix=", "/>
+          <text variable="publisher" suffix=", "/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </else-if>
+      <else-if type="speech">
+        <!-- AGLC 6.9, 6.10 for presentations, oral conference papers, speeches -->
+        <text variable="title" quotes="true"/>
+        <text macro="event" prefix=" "/>
+      </else-if>
+      <else-if type="article-newspaper article-magazine" match="any">
+        <text variable="title" suffix=", " quotes="true"/>
+        <!--AGLC 6.2 -->
+        <text variable="volume" suffix=" "/>
+        <text macro="container" suffix=", " font-style="italic"/>
+        <text macro="issuance"/>
+        <group delimiter="">
+          <text value="at" prefix=", "/>
+          <text variable="page" prefix=" "/>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <text variable="title" suffix=" " quotes="true"/>
+        <!-- AGLC 5.5, chapters in edited books -->
+        <text macro="container" suffix=" "/>
+        <text macro="issuance" prefix=" (" suffix=")"/>
+        <text variable="volume" prefix=" vol. " suffix=" "/>
+        <text variable="page" prefix=" "/>
+      </else-if>
+      <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic"/>
+        <text macro="container" prefix=" "/>
+        <text macro="issuance" prefix=" (" suffix=")"/>
+        <text variable="volume" prefix=" vol. " suffix=" "/>
+      </else-if>
+      <else-if type="webpage">
+        <!-- AGLC 6.14 -->
+        <text variable="title" font-style="italic"/>
+        <text macro="issuance" prefix=" (" suffix=")"/>
+        <text macro="container" prefix=" "/>
+      </else-if>
+      <else>
+        <text variable="volume" suffix=" "/>
+        <text variable="title" quotes="true"/>
+        <text macro="container" prefix=" "/>
+        <text macro="issuance" prefix=" (" suffix=")"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issuance">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+        <group prefix="" suffix="">
+          <choose>
+            <if type="article-newspaper thesis" match="any">
+              <date variable="issued">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" suffix=" "/>
+                <!--- DD mon YYYY -->
+              </date>
+            </if>
+          </choose>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else>
+        <text macro="translator" suffix=" "/>
+        <!-- editors go up front now; only translators go aftewards. AGLC 5.1.2, 5.1.5, 5.1.6 -->
+        <text variable="edition" suffix=" ed. "/>
+        <!-- replaced a text element with a missing variable reference -->
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <!-- sets up citing to specific page numbers -->
+  <macro name="at_page">
+    <group delimiter="">
       <choose>
-         <if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-            <group prefix="" suffix="">
-               <choose>
-                  <if type="article-newspaper thesis" match="any">
-                     <date variable="issued">
-                        <date-part name="day" suffix=" "/>
-                        <date-part name="month" suffix=" "/><!--- DD mon YYYY -->
-                     </date>
-                  </if>
-               </choose>
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
-            </group>
-         </if>
-         <else>
-            <text macro="translator" suffix=" "/><!-- editors go up front now; only translators go aftewards. AGLC 5.1.2, 5.1.5, 5.1.6 -->
-            <text variable="edition" suffix=" ed. "/><!-- replaced a text element with a missing variable reference -->
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </else>
+        <if position="ibid">
+          <!-- "Ibid 23" -->
+        </if>
+        <else-if position="subsequent">
+          <!-- "above n _, 23" -->
+          <text value="," prefix=""/>
+        </else-if>
+        <else-if type="bill book graphic legal_case motion_picture report song thesis" match="any">
+          <!-- for legislation, books, and theses, just us a space -->
+        </else-if>
+        <else>
+          <text value="," prefix=""/>
+          <!-- everything else, use a comma -->
+        </else>
       </choose>
-   </macro><!-- sets up citing to specific page numbers -->
-   <macro name="at_page">
-      <group delimiter="">
-         <choose>
-            <if position="ibid"><!-- "Ibid 23" --></if>
-            <else-if position="subsequent"><!-- "above n _, 23" -->
-               <text value="," prefix=""/>
-            </else-if>
-            <else-if type="bill book graphic legal_case motion_picture report song thesis" match="any"><!-- for legislation, books, and theses, just us a space --></else-if>
-            <else>
-               <text value="," prefix=""/><!-- everything else, use a comma -->
-            </else>
-         </choose>
-         <text variable="locator" prefix=" "/>
-      </group>
-   </macro><!-- sets up the "in" in front of book sections, etc. -->
-   <macro name="container">
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <!-- sets up the "in" in front of book sections, etc. -->
+  <macro name="container">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group delimiter="">
+          <text term="in" text-case="lowercase" prefix=" "/>
+          <text macro="editor" prefix=" "/>
+          <text variable="container-title" font-style="italic" prefix=" "/>
+        </group>
+      </if>
+      <else-if type="legal_case">
+        <text variable="container-title" form="short" prefix=" "/>
+      </else-if>
+      <else-if type="article-journal">
+        <text variable="container-title" font-style="italic" prefix=" "/>
+      </else-if>
+      <else>
+        <text variable="container-title"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1">
+    <layout suffix="." delimiter="; ">
       <choose>
-         <if type="chapter paper-conference" match="any">
-            <group delimiter="">
-               <text term="in" text-case="lowercase" prefix=" "/>
-               <text macro="editor" prefix=" "/>
-               <text variable="container-title" font-style="italic" prefix=" "/>
-            </group>
-         </if>
-         <else-if type="legal_case">
-            <text variable="container-title" form="short" prefix=" "/>
-         </else-if>
-         <else-if type="article-journal">
-            <text variable="container-title" font-style="italic" prefix=" "/>
-         </else-if>
-         <else>
-            <text variable="container-title"/>
-         </else>
-      </choose>
-   </macro>
-   <citation et-al-min="4" et-al-use-first="1">
-      <layout suffix="." delimiter="; ">
-         <choose><!-- always cite legislation in full -->
-            <if type="bill">
-               <text macro="title"/>
-               <text macro="at_page"/>
+        <!-- always cite legislation in full -->
+        <if type="bill">
+          <text macro="title"/>
+          <text macro="at_page"/>
+        </if>
+        <else-if position="ibid">
+          <text value="ibid" text-case="capitalize-first"/>
+          <text macro="at_page" suffix="."/>
+          <!-- period will not show up - this is for find-and-replace later. -->
+        </else-if>
+        <else-if position="subsequent">
+          <choose>
+            <if type="legal_case">
+              <!-- don't use 'above' for cases -->
+              <text macro="author"/>
+              <text macro="source"/>
+              <text macro="access"/>
             </if>
-            <else-if position="ibid">
-               <text value="ibid" text-case="capitalize-first"/>
-               <text macro="at_page" suffix="."/><!-- period will not show up - this is for find-and-replace later. -->
-            </else-if>
-            <else-if position="subsequent">
-               <choose>
-                  <if type="legal_case"><!-- don't use 'above' for cases -->
-                     <text macro="author"/>
-                     <text macro="source"/>
-                     <text macro="access"/>
-                  </if>
-                  <else>
-                     <text macro="author-short" suffix=","/><!-- insert short title if it is needed. --><!-- there seems to be a problem with the current processor, which requires two dates to be identitical before disambiguate="true": see http://forums.zotero.org/discussion/2688/disambiguate-by-adding-title/. For the moment, always append a short title.
+            <else>
+              <text macro="author-short" suffix=","/>
+              <!-- insert short title if it is needed. -->
+              <!-- there seems to be a problem with the current processor, which requires two dates to be identitical before disambiguate="true": see http://forums.zotero.org/discussion/2688/disambiguate-by-adding-title/. For the moment, always append a short title.
         <choose>
             <if disambiguate="true"> -->
-                     <text variable="title" form="short" prefix=" " suffix="," quotes="true"/><!-- AGLC 1.2.2 --><!--            </if>
+              <text variable="title" form="short" prefix=" " suffix="," quotes="true"/>
+              <!-- AGLC 1.2.2 -->
+              <!--            </if>
           </choose>-->
-                     <text value="above" prefix=" "/>
-                     <text value="n " prefix=" "/><!-- CSL does not currently support reference to a note number, so we leave a blank space for correction now -->
-                     <text value="___"/>
-                     <text macro="at_page"/>
-                  </else>
-               </choose>
-            </else-if><!-- position="subsequent" -->
-            <else><!-- new citation -->
-               <choose>
-                  <if type="legal_case">
-                     <text macro="author"/>
-                     <text macro="source"/>
-                     <text macro="access"/><!-- I had to move the page reference for cases within the source macro, because it sits between the reporter and the year in US blue book style -->
-                  </if>
-                  <else-if type="interview">
-                     <text macro="interviewer" suffix=" "/>
-                     <text value="Interview with "/>
-                     <text macro="author" suffix=" "/>
-                     <text macro="source"/>
-                     <text macro="at_page"/>
-                     <text macro="access"/>
-                  </else-if>
-                  <else>
-                     <text macro="author" suffix=", "/>
-                     <text macro="source"/>
-                     <text macro="at_page"/>
-                     <text macro="access"/><!-- rule 4.9, URL comes after pinpoint ref -->
-                  </else>
-               </choose>
+              <text value="above" prefix=" "/>
+              <text value="n " prefix=" "/>
+              <!-- CSL does not currently support reference to a note number, so we leave a blank space for correction now -->
+              <text value="___"/>
+              <text macro="at_page"/>
             </else>
-         </choose>
-      </layout>
-   </citation>
-</style>
\ No newline at end of file
+          </choose>
+        </else-if>
+        <!-- position="subsequent" -->
+        <else>
+          <!-- new citation -->
+          <choose>
+            <if type="legal_case">
+              <text macro="author"/>
+              <text macro="source"/>
+              <text macro="access"/>
+              <!-- I had to move the page reference for cases within the source macro, because it sits between the reporter and the year in US blue book style -->
+            </if>
+            <else-if type="interview">
+              <text macro="interviewer" suffix=" "/>
+              <text value="Interview with "/>
+              <text macro="author" suffix=" "/>
+              <text macro="source"/>
+              <text macro="at_page"/>
+              <text macro="access"/>
+            </else-if>
+            <else>
+              <text macro="author" suffix=", "/>
+              <text macro="source"/>
+              <text macro="at_page"/>
+              <text macro="access"/>
+              <!-- rule 4.9, URL comes after pinpoint ref -->
+            </else>
+          </choose>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+</style>
diff --git a/bioorganic-medicinal-chemistry-letters.csl b/bioorganic-medicinal-chemistry-letters.csl
index 8940f38ca2..2cf7b3ce75 100644
--- a/bioorganic-medicinal-chemistry-letters.csl
+++ b/bioorganic-medicinal-chemistry-letters.csl
@@ -1,173 +1,174 @@
 <?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">
-   <info>
-      <title>Bioorganic &amp; Medicinal Chemistry Letters</title>
-      <id>http://www.zotero.org/styles/bioorganic-medicinal-chemistry-letters</id>
-      <link href="http://www.zotero.org/styles/bioorganic-medicinal-chemistry-letters" rel="self"/>
-      <author>
-         <name>Jonathan BISSON</name>
-         <email>mynamemyfirstname @gmail.com</email>
-      </author>
-      <category citation-format="numeric"/>
-      <category field="chemistry"/>
-      <updated>2010-05-31T11:42:10+00:00</updated>
-      <summary>Bioorganic &amp; Medicinal Chemistry Letters style</summary>
-      <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/972/authorinstructions" rel="documentation"/>
-   </info>
-   <macro name="editor">
-      <names variable="editor">
-         <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
-         <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
-         <label form="short" prefix=", " suffix="." text-case="capitalize-first" strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="access">
-      <text variable="URL"/>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=": ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
-      </group>
-   </macro>
-   <macro name="volume">
-      <group delimiter=" ">
-         <text term="volume" form="short" suffix="." text-case="capitalize-first" strip-periods="true"/>
-         <text variable="volume"/>
-      </group>
-   </macro>
-   <macro name="series">
-      <text variable="collection-title"/>
-   </macro>
-   <macro name="pages">
-      <label variable="page" form="short" suffix=". " strip-periods="true"/>
-      <text variable="page"/>
-   </macro>
-   <macro name="book-container">
-      <group delimiter=" ">
-         <text term="in" text-case="capitalize-first"/>
-         <text variable="container-title" font-style="italic"/>
-      </group>
-   </macro>
-   <macro name="issued">
-      <date variable="issued" delimiter=" ">
-         <date-part name="year" font-weight="bold"/>
-      </date>
-   </macro>
-   <macro name="full-issued">
-      <date variable="issued" delimiter=" ">
-         <date-part name="month" form="long" suffix=" "/>
-         <date-part name="day" suffix=", "/>
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="edition">
+  <info>
+    <title>Bioorganic &amp; Medicinal Chemistry Letters</title>
+    <id>http://www.zotero.org/styles/bioorganic-medicinal-chemistry-letters</id>
+    <link href="http://www.zotero.org/styles/bioorganic-medicinal-chemistry-letters" rel="self"/>
+    <author>
+      <name>Jonathan BISSON</name>
+      <email>mynamemyfirstname @gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="chemistry"/>
+    <updated>2010-05-31T11:42:10+00:00</updated>
+    <summary>Bioorganic &amp; Medicinal Chemistry Letters style</summary>
+    <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/972/authorinstructions" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=", " initialize-with=". " name-as-sort-order="all" delimiter="; " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="capitalize-first" strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="access">
+    <text variable="URL"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" suffix="." text-case="capitalize-first" strip-periods="true"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="series">
+    <text variable="collection-title"/>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". " strip-periods="true"/>
+    <text variable="page"/>
+  </macro>
+  <macro name="book-container">
+    <group delimiter=" ">
+      <text term="in" text-case="capitalize-first"/>
+      <text variable="container-title" font-style="italic"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year" font-weight="bold"/>
+    </date>
+  </macro>
+  <macro name="full-issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="month" form="long" suffix=" "/>
+      <date-part name="day" suffix=", "/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography second-field-align="margin" entry-spacing="0">
+    <layout suffix=".">
+      <text variable="citation-number" prefix="" suffix=". "/>
+      <text macro="author" suffix=" "/>
       <choose>
-         <if is-numeric="edition">
-            <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
+        <if type="article-magazine">
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic" form="short" suffix="."/>
+            <text macro="edition"/>
+            <text macro="publisher"/>
+            <text macro="full-issued" suffix=","/>
+            <text macro="pages"/>
+          </group>
+        </if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <text variable="genre"/>
             </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="volume"/>
+            <text macro="pages"/>
+          </group>
+        </else-if>
+        <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter="; ">
+            <text variable="title" font-style="italic"/>
+            <text macro="editor" prefix=" "/>
+            <text macro="series"/>
+            <text macro="edition"/>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="issued"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="volume"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter="; ">
+            <text macro="book-container"/>
+            <text macro="editor"/>
+            <text macro="series"/>
+            <group delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="issued"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="volume"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="article-journal">
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic" form="short"/>
+            <group delimiter=", ">
+              <text macro="issued" font-weight="bold"/>
+              <text variable="volume" font-style="italic"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=" ">
+            <group delimiter=". ">
+              <text variable="title"/>
+              <text variable="container-title" font-style="italic" form="short"/>
+            </group>
+            <group delimiter=", ">
+              <text macro="issued" font-weight="bold"/>
+              <text variable="volume" font-style="italic"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
       </choose>
-   </macro>
-   <citation collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout delimiter="," vertical-align="sup">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography second-field-align="margin" entry-spacing="0">
-      <layout suffix=".">
-         <text variable="citation-number" prefix="" suffix=". "/>
-         <text macro="author" suffix=" "/>
-         <choose>
-            <if type="article-magazine">
-               <group delimiter=" ">
-                  <text variable="container-title" font-style="italic" form="short" suffix="."/>
-                  <text macro="edition"/>
-                  <text macro="publisher"/>
-                  <text macro="full-issued" suffix=","/>
-                  <text macro="pages"/>
-               </group>
-            </if>
-            <else-if type="thesis">
-               <group delimiter=", ">
-                  <group delimiter=". ">
-                     <text variable="title"/>
-                     <text variable="genre"/>
-                  </group>
-                  <text macro="publisher"/>
-                  <text macro="issued"/>
-                  <text macro="volume"/>
-                  <text macro="pages"/>
-               </group>
-            </else-if>
-            <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-               <group delimiter="; ">
-                  <text variable="title" font-style="italic"/>
-                  <text macro="editor" prefix=" "/>
-                  <text macro="series"/>
-                  <text macro="edition"/>
-                  <group delimiter=", ">
-                     <text macro="publisher"/>
-                     <text macro="issued"/>
-                  </group>
-                  <group delimiter=", ">
-                     <text macro="volume"/>
-                     <text macro="pages"/>
-                  </group>
-               </group>
-            </else-if>
-            <else-if type="chapter paper-conference" match="any">
-               <group delimiter="; ">
-                  <text macro="book-container"/>
-                  <text macro="editor"/>
-                  <text macro="series"/>
-                  <group delimiter=", ">
-                     <text macro="publisher"/>
-                     <text macro="issued"/>
-                  </group>
-                  <group delimiter=", ">
-                     <text macro="volume"/>
-                     <text macro="pages"/>
-                  </group>
-               </group>
-            </else-if>
-            <else-if type="article-journal">
-               <group delimiter=" ">
-                  <text variable="container-title" font-style="italic" form="short"/>
-                  <group delimiter=", ">
-                     <text macro="issued" font-weight="bold"/>
-                     <text variable="volume" font-style="italic"/>
-                     <text variable="page"/>
-                  </group>
-               </group>
-            </else-if>
-            <else>
-               <group delimiter=" ">
-                  <group delimiter=". ">
-                     <text variable="title"/>
-                     <text variable="container-title" font-style="italic" form="short"/>
-                  </group>
-                  <group delimiter=", ">
-                     <text macro="issued" font-weight="bold"/>
-                     <text variable="volume" font-style="italic"/>
-                     <text variable="page"/>
-                  </group>
-               </group>
-            </else>
-         </choose>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </layout>
+  </bibliography>
+</style>
diff --git a/blank.csl b/blank.csl
index 6f8985de70..8d115759b7 100644
--- a/blank.csl
+++ b/blank.csl
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0">
-   <info>
-      <title>Hide citations and bibliography</title>
-      <id>http://www.zotero.org/styles/blank</id>
-      <link href="http://www.zotero.org/styles/blank" rel="self"/>
-      <author>
-         <name>Mikko Rönkkö</name>
-         <email>mikko.ronkko@iki.fi</email>
-      </author>
-      <category field="generic-base"/>
-      <updated/>
-   </info>
-</style>
\ No newline at end of file
+  <info>
+    <title>Hide citations and bibliography</title>
+    <id>http://www.zotero.org/styles/blank</id>
+    <link href="http://www.zotero.org/styles/blank" rel="self"/>
+    <author>
+      <name>Mikko Rönkkö</name>
+      <email>mikko.ronkko@iki.fi</email>
+    </author>
+    <category field="generic-base"/>
+    <updated/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+</style>
diff --git a/cepal.csl b/cepal.csl
index 7b384e1d25..d93a4c2451 100644
--- a/cepal.csl
+++ b/cepal.csl
@@ -1,403 +1,404 @@
 <?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">
-   <info>
-      <title>UN_ECLAC_CEPAL-v3.1</title>
-      <id>http://www.zotero.org/styles/cepal</id>
-      <link href="http://www.zotero.org/styles/cepal" rel="self"/>
-      <author>
-         <name>Marcelo LaFleur</name>
-         <email>marcelo.lafleur@cepal.org</email>
-      </author>
-      <category citation-format="author-date"/>
-      <category field="political_science"/>
-      <updated>2008-11-22T17:18:47+00:00</updated>
-      <summary>Draft spanish bibliography style to use for ECLAC/CEPAL in Santiago.</summary>
-   </info>
-   <locale xml:lang="en">
-      <terms>
-         <term name="editor" form="short">
-            <single>ed.</single>
-            <multiple>eds.</multiple>
-         </term>
-         <term name="editor">
-            <single>ed.</single>
-            <multiple>eds.</multiple>
-         </term>
-         <term name="et-al">y otros</term>
-         <term name="and">y</term>
-         <term name="page" form="short">
-            <single>p</single>
-            <multiple>pp</multiple>
-         </term>
-         <term name="page">
-            <single>p</single>
-            <multiple>pp</multiple>
-         </term>
-         <term name="chapter" form="short">
-            <single>cap</single>
-            <multiple>caps</multiple>
-         </term>
-         <term name="chapter">
-            <single>capítulo</single>
-            <multiple>capítulos</multiple>
-         </term>
-         <term name="accessed">fecha de consulta</term>
-         <term name="in">en</term>
-         <term name="forthcoming">previsto</term>
-         <term name="month-01">Enero</term>
-         <term name="month-02">Febrero</term>
-         <term name="month-03">Marzo</term>
-         <term name="month-04">Abril</term>
-         <term name="month-05">Mayo</term>
-         <term name="month-06">Junio</term>
-         <term name="month-07">Julio</term>
-         <term name="month-08">Agosto</term>
-         <term name="month-09">Septiembre</term>
-         <term name="month-10">Octubre</term>
-         <term name="month-11">Noviembre</term>
-         <term name="month-12">Diciembre</term>
-      </terms>
-   </locale>
-   <macro name="editor">
-      <names variable="editor" delimiter=", ">
-         <label form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="author">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="none">
-            <choose>
-               <if variable="author editor translator" match="any">
-                  <names variable="author">
-                     <name name-as-sort-order="first" and="text" sort-separator=", " 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>
-               </if>
-               <else-if variable="publisher" match="any">
-                  <text variable="publisher"/>
-               </else-if>
-               <else>
-                  <text variable="container-title"/>
-               </else>
-            </choose>
-         </if>
-         <else>
+  <info>
+    <title>UN_ECLAC_CEPAL-v3.1</title>
+    <id>http://www.zotero.org/styles/cepal</id>
+    <link href="http://www.zotero.org/styles/cepal" rel="self"/>
+    <author>
+      <name>Marcelo LaFleur</name>
+      <email>marcelo.lafleur@cepal.org</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="political_science"/>
+    <updated>2008-11-22T17:18:47+00:00</updated>
+    <summary>Draft spanish bibliography style to use for ECLAC/CEPAL in Santiago.</summary>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="editor">
+        <single>ed.</single>
+        <multiple>eds.</multiple>
+      </term>
+      <term name="et-al">y otros</term>
+      <term name="and">y</term>
+      <term name="page" form="short">
+        <single>p</single>
+        <multiple>pp</multiple>
+      </term>
+      <term name="page">
+        <single>p</single>
+        <multiple>pp</multiple>
+      </term>
+      <term name="chapter" form="short">
+        <single>cap</single>
+        <multiple>caps</multiple>
+      </term>
+      <term name="chapter">
+        <single>capítulo</single>
+        <multiple>capítulos</multiple>
+      </term>
+      <term name="accessed">fecha de consulta</term>
+      <term name="in">en</term>
+      <term name="forthcoming">previsto</term>
+      <term name="month-01">Enero</term>
+      <term name="month-02">Febrero</term>
+      <term name="month-03">Marzo</term>
+      <term name="month-04">Abril</term>
+      <term name="month-05">Mayo</term>
+      <term name="month-06">Junio</term>
+      <term name="month-07">Julio</term>
+      <term name="month-08">Agosto</term>
+      <term name="month-09">Septiembre</term>
+      <term name="month-10">Octubre</term>
+      <term name="month-11">Noviembre</term>
+      <term name="month-12">Diciembre</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="short" text-case="lowercase" suffix=". " strip-periods="true"/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="none">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <names variable="author">
+              <name name-as-sort-order="first" and="text" sort-separator=", " 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>
+          </if>
+          <else-if variable="publisher" match="any">
+            <text variable="publisher"/>
+          </else-if>
+          <else>
+            <text variable="container-title"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="collection-title">
+            <text variable="collection-title" font-style="italic"/>
+          </if>
+          <else>
             <choose>
-               <if variable="collection-title">
-                  <text variable="collection-title" font-style="italic"/>
-               </if>
-               <else>
-                  <choose>
-                     <if variable="author editor translator" match="any">
-                        <names variable="author">
-                           <name name-as-sort-order="first" and="text" sort-separator=", " 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>
-                     </if>
-                     <else-if variable="publisher" match="any">
-                        <text variable="publisher"/>
-                     </else-if>
-                     <else>
-                        <text variable="container-title"/>
-                     </else>
-                  </choose>
-               </else>
+              <if variable="author editor translator" match="any">
+                <names variable="author">
+                  <name name-as-sort-order="first" and="text" sort-separator=", " 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>
+              </if>
+              <else-if variable="publisher" match="any">
+                <text variable="publisher"/>
+              </else-if>
+              <else>
+                <text variable="container-title"/>
+              </else>
             </choose>
-         </else>
-      </choose>
-   </macro>
-   <macro name="author-short">
-      <names variable="author">
-         <name form="short" and="text" delimiter=", " initialize-with=". " delimiter-precedes-last="never"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text variable="title"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="access">
-      <choose>
-         <if type="webpage">
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". " delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="webpage">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="lowercase" prefix="[" suffix="]"/>
+          </if>
+          <else>
+            <text value="en línea" prefix=" [" suffix="]"/>
+          </else>
+        </choose>
+        <group prefix=" " delimiter=" ">
+          <group prefix="[" suffix="]">
+            <text term="accessed" suffix=": "/>
+            <date variable="accessed">
+              <date-part name="day" suffix=" de "/>
+              <date-part name="month" text-case="lowercase" suffix=" de "/>
+              <date-part name="year"/>
+            </date>
+          </group>
+        </group>
+        <text variable="URL" prefix=" &lt;" suffix="&gt;" font-style="normal"/>
+      </if>
+      <else-if type="article-journal article-magazine article-newspaper" match="any">
+        <date variable="issued" prefix=" ">
+          <date-part name="day" suffix=" de "/>
+          <date-part name="month" text-case="lowercase"/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" text-case="sentence" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="onuventa">
+    <choose>
+      <if variable="note">
+        <text variable="note" prefix="Publicación de las Naciones Unidas, N° de venta: "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="onusig">
+    <choose>
+      <if variable="note">
+        <choose>
+          <if type="bill book graphic legal_case motion_picture report song" match="any">
+            <text variable="call-number" prefix=" (" suffix=")"/>
+          </if>
+          <else>
             <choose>
-               <if variable="genre">
-                  <text variable="genre" text-case="lowercase" prefix="[" suffix="]"/>
-               </if>
-               <else>
-                  <text value="en línea" prefix=" [" suffix="]"/>
-               </else>
+              <if variable="call-number">
+                <text variable="call-number" prefix=" (" suffix=")"/>
+              </if>
+              <else-if variable="number">
+                <text variable="number" prefix=" (" suffix=")"/>
+              </else-if>
+              <else-if variable="volume">
+                <text variable="volume" prefix=" (" suffix=")"/>
+              </else-if>
             </choose>
-            <group prefix=" " delimiter=" ">
-               <group prefix="[" suffix="]">
-                  <text term="accessed" suffix=": "/>
-                  <date variable="accessed">
-                     <date-part name="day" suffix=" de "/>
-                     <date-part name="month" text-case="lowercase" suffix=" de "/>
-                     <date-part name="year"/>
-                  </date>
-               </group>
-            </group>
-            <text variable="URL" prefix=" &lt;" suffix="&gt;" font-style="normal"/>
-         </if>
-         <else-if type="article-journal article-magazine article-newspaper" match="any">
-            <date variable="issued" prefix=" ">
-               <date-part name="day" suffix=" de "/>
-               <date-part name="month" text-case="lowercase"/>
-            </date>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" text-case="sentence" font-style="italic"/>
-         </if>
-         <else>
-            <text variable="title"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="onuventa">
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="event"/>
       <choose>
-         <if variable="note">
-            <text variable="note" prefix="Publicación de las Naciones Unidas, N° de venta: "/>
-         </if>
+        <if variable="publisher publisher-place" match="any">
+          <text variable="publisher-place"/>
+          <choose>
+            <if variable="author editor translator" match="any">
+              <text variable="publisher" prefix=", "/>
+            </if>
+          </choose>
+        </if>
+        <else>
+          <text variable="container-title"/>
+        </else>
       </choose>
-   </macro>
-   <macro name="onusig">
+    </group>
+  </macro>
+  <macro name="year-date">
+    <group prefix="">
       <choose>
-         <if variable="note">
-            <choose>
-               <if type="bill book graphic legal_case motion_picture report song" match="any">
-                  <text variable="call-number" prefix=" (" suffix=")"/>
-               </if>
-               <else>
-                  <choose>
-                     <if variable="call-number">
-                        <text variable="call-number" prefix=" (" suffix=")"/>
-                     </if>
-                     <else-if variable="number">
-                        <text variable="number" prefix=" (" suffix=")"/>
-                     </else-if>
-                     <else-if variable="volume">
-                        <text variable="volume" prefix=" (" suffix=")"/>
-                     </else-if>
-                  </choose>
-               </else>
-            </choose>
-         </if>
+        <if variable="issued">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </if>
+        <else>
+          <text term="no date" form="short"/>
+        </else>
       </choose>
-   </macro>
-   <macro name="publisher">
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group delimiter=", ">
+          <text variable="volume" prefix="vol. "/>
+          <text variable="issue" prefix="N° "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <choose>
+          <if variable="collection-title" match="none">
+            <group prefix=" (" suffix=")" delimiter=", ">
+              <text macro="edition"/>
+              <group>
+                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+                <number variable="number-of-volumes" form="numeric" prefix="1-"/>
+              </group>
+              <group>
+                <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+                <number variable="volume" form="numeric"/>
+              </group>
+              <group>
+                <label variable="page" form="short" suffix=" "/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </if>
+          <else>
+            <group delimiter=", ">
+              <text variable="volume" prefix="vol. "/>
+              <text variable="collection-number" prefix="N° "/>
+            </group>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short" prefix=", "/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="6" 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 variable="event"/>
-         <choose>
-            <if variable="publisher publisher-place" match="any">
-               <text variable="publisher-place"/>
-               <choose>
-                  <if variable="author editor translator" match="any">
-                     <text variable="publisher" prefix=", "/>
-                  </if>
-               </choose>
-            </if>
-            <else>
-               <text variable="container-title"/>
-            </else>
-         </choose>
-      </group>
-   </macro>
-   <macro name="year-date">
-      <group prefix="">
-         <choose>
-            <if variable="issued">
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
-            </if>
-            <else>
-               <text term="no date" form="short"/>
-            </else>
-         </choose>
-      </group>
-   </macro>
-   <macro name="edition">
-      <choose>
-         <if is-numeric="edition">
-            <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
+        <choose>
+          <if variable="author editor translator" match="any">
+            <group delimiter=", ">
+              <text macro="author-short"/>
+              <text macro="year-date"/>
             </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="locators">
-      <choose>
-         <if type="article-journal article-magazine article-newspaper" match="any">
+            <text macro="citation-locator"/>
+          </if>
+          <else-if variable="publisher" match="any">
             <group delimiter=", ">
-               <text variable="volume" prefix="vol. "/>
-               <text variable="issue" prefix="N° "/>
+              <text variable="publisher" font-style="italic"/>
+              <text macro="year-date"/>
             </group>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <choose>
-               <if variable="collection-title" match="none">
-                  <group prefix=" (" suffix=")" delimiter=", ">
-                     <text macro="edition"/>
-                     <group>
-                        <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                        <number variable="number-of-volumes" form="numeric" prefix="1-"/>
-                     </group>
-                     <group>
-                        <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                        <number variable="volume" form="numeric"/>
-                     </group>
-                     <group>
-                        <label variable="page" form="short" suffix=" "/>
-                        <text variable="page"/>
-                     </group>
-                  </group>
-               </if>
-               <else>
-                  <group delimiter=", ">
-                     <text variable="volume" prefix="vol. "/>
-                     <text variable="collection-number" prefix="N° "/>
-                  </group>
-               </else>
-            </choose>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="citation-locator">
-      <group>
-         <label variable="locator" form="short" prefix=", "/>
-         <text variable="locator" prefix=" "/>
+            <text macro="citation-locator"/>
+          </else-if>
+          <else>
+            <group delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="year-date"/>
+            </group>
+            <text macro="citation-locator"/>
+          </else>
+        </choose>
       </group>
-   </macro>
-   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="6" 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=", ">
-            <choose>
-               <if variable="author editor translator" match="any">
-                  <group delimiter=", ">
-                     <text macro="author-short"/>
-                     <text macro="year-date"/>
-                  </group>
-                  <text macro="citation-locator"/>
-               </if>
-               <else-if variable="publisher" match="any">
-                  <group delimiter=", ">
-                     <text variable="publisher" font-style="italic"/>
-                     <text macro="year-date"/>
-                  </group>
-                  <text macro="citation-locator"/>
-               </else-if>
-               <else>
-                  <group delimiter=", ">
-                     <text variable="container-title" font-style="italic"/>
-                     <text macro="year-date"/>
-                  </group>
-                  <text macro="citation-locator"/>
-               </else>
-            </choose>
-         </group>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" subsequent-author-substitute="---" entry-spacing="1">
-      <sort>
-         <key macro="author"/>
-         <key variable="issued" sort="descending"/>
-      </sort>
-      <layout suffix=".">
-         <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">
-               <choose>
-                  <if variable="collection-title" match="none">
-                     <group>
-                        <text macro="title" prefix=" "/>
-                        <text macro="onusig"/>
-                     </group>
-                     <group prefix=", " delimiter=", ">
-                        <text macro="edition"/>
-                        <text macro="editor"/>
-                     </group>
-                     <text macro="publisher" prefix=", "/>
-                     <date variable="issued" prefix=", " suffix="">
-                        <date-part name="month" text-case="lowercase"/>
-                     </date>
-                  </if>
-                  <else>
-                     <text macro="locators"/>
-                     <text macro="onusig"/>
-                     <text macro="publisher" prefix=", "/>
-                     <date variable="issued" prefix=", " suffix="">
-                        <date-part name="day" suffix=" de "/>
-                        <date-part name="month" text-case="lowercase"/>
-                     </date>
-                  </else>
-               </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1" subsequent-author-substitute="---" entry-spacing="1">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued" sort="descending"/>
+    </sort>
+    <layout suffix=".">
+      <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">
+          <choose>
+            <if variable="collection-title" match="none">
+              <group>
+                <text macro="title" prefix=" "/>
+                <text macro="onusig"/>
+              </group>
+              <group prefix=", " delimiter=", ">
+                <text macro="edition"/>
+                <text macro="editor"/>
+              </group>
+              <text macro="publisher" prefix=", "/>
+              <date variable="issued" prefix=", " suffix="">
+                <date-part name="month" text-case="lowercase"/>
+              </date>
             </if>
-            <else-if type="chapter paper-conference" match="any">
-               <group>
-                  <text macro="title" text-case="sentence" prefix=" " quotes="true"/>
-                  <text macro="onusig"/>
-               </group>
-               <group prefix=", " delimiter=", ">
-                  <text variable="container-title" font-style="italic"/>
-                  <text variable="collection-title"/>
-                  <text macro="editor"/>
-                  <text variable="publisher-place"/>
-                  <text variable="publisher"/>
-                  <text variable="page" prefix="p. "/>
-               </group>
-            </else-if>
-            <else-if type="article-journal article-magazine article-newspaper" match="any">
-               <group>
-                  <text macro="title" text-case="sentence" prefix=" " quotes="true"/>
-                  <text macro="onusig"/>
-               </group>
-               <group prefix=", " delimiter=", ">
-                  <text variable="container-title" font-style="italic"/>
-                  <text variable="collection-title"/>
-                  <text macro="locators"/>
-               </group>
-               <group prefix=", " delimiter=", ">
-                  <text macro="editor"/>
-                  <text variable="publisher-place"/>
-                  <text variable="publisher"/>
-               </group>
-            </else-if>
-            <else-if type="webpage">
-               <group delimiter=", ">
-                  <text macro="title" prefix=" " quotes="true"/>
-                  <text macro="editor"/>
-               </group>
-            </else-if>
             <else>
-               <group delimiter=", ">
-                  <text macro="title" prefix=" " quotes="true"/>
-                  <text macro="editor"/>
-                  <text variable="container-title" font-style="italic"/>
-               </group>
+              <text macro="locators"/>
+              <text macro="onusig"/>
+              <text macro="publisher" prefix=", "/>
+              <date variable="issued" prefix=", " suffix="">
+                <date-part name="day" suffix=" de "/>
+                <date-part name="month" text-case="lowercase"/>
+              </date>
             </else>
-         </choose>
-         <text macro="access" prefix=","/>
-         <text macro="onuventa" prefix=". "/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+          </choose>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group>
+            <text macro="title" text-case="sentence" prefix=" " quotes="true"/>
+            <text macro="onusig"/>
+          </group>
+          <group prefix=", " delimiter=", ">
+            <text variable="container-title" font-style="italic"/>
+            <text variable="collection-title"/>
+            <text macro="editor"/>
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+            <text variable="page" prefix="p. "/>
+          </group>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper" match="any">
+          <group>
+            <text macro="title" text-case="sentence" prefix=" " quotes="true"/>
+            <text macro="onusig"/>
+          </group>
+          <group prefix=", " delimiter=", ">
+            <text variable="container-title" font-style="italic"/>
+            <text variable="collection-title"/>
+            <text macro="locators"/>
+          </group>
+          <group prefix=", " delimiter=", ">
+            <text macro="editor"/>
+            <text variable="publisher-place"/>
+            <text variable="publisher"/>
+          </group>
+        </else-if>
+        <else-if type="webpage">
+          <group delimiter=", ">
+            <text macro="title" prefix=" " quotes="true"/>
+            <text macro="editor"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="title" prefix=" " quotes="true"/>
+            <text macro="editor"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
+        </else>
+      </choose>
+      <text macro="access" prefix=","/>
+      <text macro="onuventa" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/chinese-building-structure.csl b/chinese-building-structure.csl
index b405a29d57..870127c1f1 100644
--- a/chinese-building-structure.csl
+++ b/chinese-building-structure.csl
@@ -1,107 +1,108 @@
 <?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">
-   <info>
-      <title>Building Structure [Chinese]</title>
-      <id>http://www.zotero.org/styles/chinese-building-structure</id>
-      <link href="http://www.zotero.org/styles/chinese-building-structure" rel="self"/>
-      <author>
-         <name>Ben</name>
-         <email>bodxp@163.com</email>
-      </author>
-      <category field="engineering"/>
-      <category citation-format="numeric"/>
-      <category field="science"/>
-      <updated>2008-08-27T09:25:20+08:00</updated>
-      <summary>This style format is customized for a Chinese magazine "Building Structure". More information, please visted the author's blog:http://www.lubanren.com/weblog/</summary>
-   </info>
-   <macro name="author">
-      <names variable="author">
-         <name name-as-sort-order="all" sort-separator=" " delimiter="," delimiter-precedes-last="always"/>
-         <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="title"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name initialize-with="." delimiter=", " and="text"/>
-         <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="title">
+  <info>
+    <title>Building Structure [Chinese]</title>
+    <id>http://www.zotero.org/styles/chinese-building-structure</id>
+    <link href="http://www.zotero.org/styles/chinese-building-structure" rel="self"/>
+    <author>
+      <name>Ben</name>
+      <email>bodxp@163.com</email>
+    </author>
+    <category field="engineering"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <updated>2008-08-27T09:25:20+08:00</updated>
+    <summary>This style format is customized for a Chinese magazine "Building Structure". More information, please visted the author's blog:http://www.lubanren.com/weblog/</summary>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " delimiter="," delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with="." delimiter=", " and="text"/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place" suffix=": " prefix=" "/>
+    <text variable="publisher" suffix=". "/>
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="access">
+    <text variable="URL"/>
+  </macro>
+  <macro name="page">
+    <group>
+      <label variable="page" form="short" suffix=". " strip-periods="true"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="3" et-al-use-first="1" second-field-align="flush" entry-spacing="0">
+    <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">
-            <text variable="title"/>
-         </if>
-         <else>
-            <text variable="title"/>
-         </else>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter=",">
+            <text macro="title" suffix="[M]. "/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=". ">
+            <text macro="title" suffix="[D]. "/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="editor"/>
+            <text macro="publisher"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else>
+          <text macro="title" suffix="[J]. "/>
+          <group delimiter=",">
+            <text variable="container-title"/>
+            <date variable="issued">
+              <date-part name="month" form="short" suffix=". " strip-periods="true"/>
+              <date-part name="year"/>
+            </date>
+            <group>
+              <text variable="volume" prefix=" "/>
+              <text variable="issue" prefix="(" suffix=")"/>
+              <text variable="page" prefix=":"/>
+            </group>
+          </group>
+        </else>
       </choose>
-   </macro>
-   <macro name="publisher">
-      <text variable="publisher-place" suffix=": " prefix=" "/>
-      <text variable="publisher" suffix=". "/>
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="access">
-      <text variable="URL"/>
-   </macro>
-   <macro name="page">
-      <group>
-         <label variable="page" form="short" suffix=". " strip-periods="true"/>
-         <text variable="page"/>
-      </group>
-   </macro>
-   <citation collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout prefix="[" suffix="]" delimiter=",">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography et-al-min="3" et-al-use-first="1" second-field-align="flush" entry-spacing="0">
-      <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=",">
-                  <text macro="title" suffix="[M]. "/>
-                  <text macro="publisher"/>
-               </group>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <group delimiter=". ">
-                  <text macro="title" suffix="[D]. "/>
-                  <text variable="container-title" font-style="italic"/>
-                  <text macro="editor"/>
-                  <text macro="publisher"/>
-                  <text macro="page"/>
-               </group>
-            </else-if>
-            <else>
-               <text macro="title" suffix="[J]. "/>
-               <group delimiter=",">
-                  <text variable="container-title"/>
-                  <date variable="issued">
-                     <date-part name="month" form="short" suffix=". " strip-periods="true"/>
-                     <date-part name="year"/>
-                  </date>
-                  <group>
-                     <text variable="volume" prefix=" "/>
-                     <text variable="issue" prefix="(" suffix=")"/>
-                     <text variable="page" prefix=":"/>
-                  </group>
-               </group>
-            </else>
-         </choose>
-         <text macro="access" prefix="; "/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+      <text macro="access" prefix="; "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/clinical-cancer-research.csl b/clinical-cancer-research.csl
index 50188cc13a..6a2ac875a7 100644
--- a/clinical-cancer-research.csl
+++ b/clinical-cancer-research.csl
@@ -1,117 +1,118 @@
 <?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">
-   <info>
-      <title>Clinical Cancer Research</title>
-      <id>http://www.zotero.org/styles/clinical-cancer-research</id>
-      <link href="http://www.zotero.org/styles/clinical-cancer-research" rel="self"/>
-      <link href="http://www.zotero.org/styles/aacr" rel="template"/>
-      <link href="http://clincancerres.aacrjournals.org/misc/ifora.shtml#g" rel="documentation"/>
-      <author>
-         <name>Maxime Rigo</name>
-         <email>lemaxx@gmail.com</email>
-      </author>
-      <contributor>
-         <name>Richard Karnesky</name>
-         <email>karnesky+zotero@gmail.com</email>
-         <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-      </contributor>
-      <category field="biology"/>
-      <category citation-format="numeric"/>
-      <updated/>
-   </info>
-   <macro name="author">
-      <names variable="author" suffix=". ">
-         <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      </names>
-   </macro>
-   <macro name="editor">
-      <names variable="editor" suffix=", editor(s). ">
-         <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      </names>
-   </macro>
-   <macro name="publisher">
-      <text variable="publisher-place" suffix=": "/>
-      <text variable="publisher" suffix="; "/>
-      <date variable="issued">
-         <date-part name="year" suffix=". "/>
-      </date>
-   </macro>
-   <macro name="access">
-      <group delimiter=" ">
-         <group prefix="[" suffix="]" delimiter=" ">
-            <text term="cited" text-case="lowercase"/>
-            <date variable="accessed" suffix=" ">
-               <date-part name="year"/>
-               <date-part name="month" prefix=" " form="short" strip-periods="true"/>
-               <date-part name="day" prefix=" "/>
-            </date>
-         </group>
-         <group>
-            <text value="Available from: "/>
-            <text variable="URL"/>
-         </group>
+  <info>
+    <title>Clinical Cancer Research</title>
+    <id>http://www.zotero.org/styles/clinical-cancer-research</id>
+    <link href="http://www.zotero.org/styles/clinical-cancer-research" rel="self"/>
+    <link href="http://www.zotero.org/styles/aacr" rel="template"/>
+    <link href="http://clincancerres.aacrjournals.org/misc/ifora.shtml#g" rel="documentation"/>
+    <author>
+      <name>Maxime Rigo</name>
+      <email>lemaxx@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <category field="biology"/>
+    <category citation-format="numeric"/>
+    <updated/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="author">
+    <names variable="author" suffix=". ">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" suffix=", editor(s). ">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place" suffix=": "/>
+    <text variable="publisher" suffix="; "/>
+    <date variable="issued">
+      <date-part name="year" suffix=". "/>
+    </date>
+  </macro>
+  <macro name="access">
+    <group delimiter=" ">
+      <group prefix="[" suffix="]" delimiter=" ">
+        <text term="cited" text-case="lowercase"/>
+        <date variable="accessed" suffix=" ">
+          <date-part name="year"/>
+          <date-part name="month" prefix=" " form="short" strip-periods="true"/>
+          <date-part name="day" prefix=" "/>
+        </date>
       </group>
-   </macro>
-   <macro name="title">
-      <group delimiter=" ">
-         <text variable="title"/>
-         <choose>
-            <if variable="URL">
-               <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
-            </if>
-         </choose>
+      <group>
+        <text value="Available from: "/>
+        <text variable="URL"/>
       </group>
-   </macro>
-   <macro name="edition">
+    </group>
+  </macro>
+  <macro name="title">
+    <group delimiter=" ">
+      <text variable="title"/>
       <choose>
-         <if is-numeric="edition">
-            <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
-            </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
+        <if variable="URL">
+          <text term="internet" prefix="[" suffix="]" text-case="capitalize-first"/>
+        </if>
       </choose>
-   </macro>
-   <citation collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
-      <layout>
-         <text variable="citation-number" suffix=". "/>
-         <text macro="author"/>
-         <text macro="title" suffix=". "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <text macro="edition" prefix=" " suffix=" "/>
-               <text macro="publisher" prefix=" "/>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <group prefix=" " suffix=". ">
-                  <text term="in" suffix=": " text-case="capitalize-first"/>
-                  <text macro="editor"/>
-                  <text variable="container-title"/>
-               </group>
-               <text macro="publisher" prefix=" "/>
-               <text variable="page" prefix=" p. " suffix="."/>
-            </else-if>
-            <else>
-               <text variable="container-title" suffix=" " form="short"/>
-               <date variable="issued" suffix=";">
-                  <date-part name="year" suffix=" "/>
-               </date>
-               <text variable="volume" suffix=":"/>
-               <text variable="page" suffix="."/>
-            </else>
-         </choose>
-         <text macro="access"/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <text macro="title" suffix=". "/>
+      <choose>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <text macro="edition" prefix=" " suffix=" "/>
+          <text macro="publisher" prefix=" "/>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group prefix=" " suffix=". ">
+            <text term="in" suffix=": " text-case="capitalize-first"/>
+            <text macro="editor"/>
+            <text variable="container-title"/>
+          </group>
+          <text macro="publisher" prefix=" "/>
+          <text variable="page" prefix=" p. " suffix="."/>
+        </else-if>
+        <else>
+          <text variable="container-title" suffix=" " form="short"/>
+          <date variable="issued" suffix=";">
+            <date-part name="year" suffix=" "/>
+          </date>
+          <text variable="volume" suffix=":"/>
+          <text variable="page" suffix="."/>
+        </else>
+      </choose>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/diplo.csl b/diplo.csl
index 566631fefe..a68a3f6c39 100644
--- a/diplo.csl
+++ b/diplo.csl
@@ -1,392 +1,393 @@
 <?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">
-   <info>
-      <title>Diplo Reference Format</title>
-      <id>http://www.zotero.org/styles/diplo</id>
-      <link href="http://www.zotero.org/styles/diplo" rel="self"/>
-      <author>
-         <name>Zoran Kracunovic</name>
-         <email>zorank@diplomacy.edu</email>
-      </author>
-      <category citation-format="author-date"/>
-      <category field="generic-base"/>
-      <updated>2011-04-09T19:25:45+00:00</updated>
-      <summary>Diplo Reference Style</summary>
-   </info>
-   <locale xml:lang="en">
-      <terms>
-         <term name="et-al">et al.</term>
-         <term name="no date" form="short">no date</term>
-         <term name="editor" form="verb-short">ed. by</term>
-         <term name="editor" form="short">
-            <single>[ed]</single>
-            <multiple>[eds]</multiple>
-         </term>
-         <term name="anonymous" form="short">Anon.</term>
-      </terms>
-   </locale>
-   <macro name="author-sort">
+  <info>
+    <title>Diplo Reference Format</title>
+    <id>http://www.zotero.org/styles/diplo</id>
+    <link href="http://www.zotero.org/styles/diplo" rel="self"/>
+    <author>
+      <name>Zoran Kracunovic</name>
+      <email>zorank@diplomacy.edu</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2011-04-09T19:25:45+00:00</updated>
+    <summary>Diplo Reference Style</summary>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="et-al">et al.</term>
+      <term name="no date" form="short">no date</term>
+      <term name="editor" form="verb-short">ed. by</term>
+      <term name="editor" form="short">
+        <single>[ed]</single>
+        <multiple>[eds]</multiple>
+      </term>
+      <term name="anonymous" form="short">Anon.</term>
+    </terms>
+  </locale>
+  <macro name="author-sort">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song broadcast thesis chapter paper-conference" match="any">
+        <choose>
+          <if variable="author">
+            <text macro="author" suffix=" "/>
+            <text macro="issued-general" suffix=" "/>
+          </if>
+          <else-if variable="editor">
+            <text macro="editor" suffix=" "/>
+            <text macro="issued-general" suffix=" "/>
+          </else-if>
+        </choose>
+      </if>
+      <else-if type="webpage">
+        <choose>
+          <if variable="author">
+            <text macro="author" suffix=" "/>
+            <text macro="year-date" prefix="(" suffix=")"/>
+          </if>
+          <else-if variable="container-title">
+            <text variable="container-title" suffix=". "/>
+            <text macro="year-date" prefix="(" suffix=")"/>
+          </else-if>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if variable="author">
+            <text macro="author" suffix=" "/>
+            <text macro="issued-general" suffix=" "/>
+          </if>
+          <else-if variable="editor">
+            <text macro="editor" suffix=" "/>
+            <text macro="issued-general" suffix=" "/>
+          </else-if>
+          <else-if variable="publisher">
+            <text variable="publisher" suffix=" "/>
+            <text macro="issued-general" suffix=" "/>
+          </else-if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
+      <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="editor-short">
+    <names variable="editor" suffix=",">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
+    </names>
+  </macro>
+  <macro name="editor-in">
+    <names variable="editor">
+      <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
+      <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" strip-periods="true"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase" strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author" suffix=",">
+      <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <text value="Available at" suffix=" "/>
+        <text variable="URL"/>
+        <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>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title" font-style="italic"/>
+  </macro>
+  <macro name="title-article">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="issued-general">
+    <date variable="issued">
+      <date-part name="year" prefix="(" suffix=")"/>
+    </date>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="online-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" form="short" suffix=" "/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="sort">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song broadcast thesis chapter paper-conference" match="any">
+        <choose>
+          <if variable="author">
+            <text macro="author"/>
+          </if>
+          <else-if variable="editor">
+            <text macro="editor"/>
+          </else-if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="webpage">
+        <choose>
+          <if variable="author">
+            <text macro="author"/>
+          </if>
+          <else-if variable="container-title">
+            <text variable="container-title" suffix="."/>
+          </else-if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if variable="author">
+            <text macro="author"/>
+          </if>
+          <else-if variable="editor">
+            <text macro="editor"/>
+          </else-if>
+          <else-if variable="publisher">
+            <text variable="publisher" suffix="."/>
+          </else-if>
+          <else-if variable="container-title">
+            <text variable="container-title" suffix="."/>
+          </else-if>
+          <else>
+            <text macro="title"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </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">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <choose>
+          <if variable="author">
+            <text macro="author-short" suffix=" "/>
+            <text macro="year-date"/>
+          </if>
+          <else-if variable="editor">
+            <text macro="editor-short" suffix=" "/>
+            <text macro="year-date"/>
+          </else-if>
+        </choose>
+        <group>
+          <label variable="locator" suffix=". " form="short" strip-periods="true"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="false" et-al-min="3" et-al-use-first="1">
+    <sort>
+      <key macro="sort"/>
+      <key variable="issued"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
       <choose>
-         <if type="bill book graphic legal_case motion_picture report song broadcast thesis chapter paper-conference" match="any">
+        <if type="song motion_picture broadcast" match="any">
+          <text macro="author-sort"/>
+          <group delimiter=" " suffix=".">
+            <text macro="title"/>
             <choose>
-               <if variable="author">
-                  <text macro="author" suffix=" "/>
-                  <text macro="issued-general" suffix=" "/>
-               </if>
-               <else-if variable="editor">
-                  <text macro="editor" suffix=" "/>
-                  <text macro="issued-general" suffix=" "/>
-               </else-if>
+              <if type="song">
+                <text value="audio recording" prefix="[" suffix="]"/>
+              </if>
+              <else-if type="motion_picture">
+                <text value="film" prefix="[" suffix="]"/>
+              </else-if>
+              <else-if type="broadcast">
+                <text value="broadcast" prefix="[" suffix="]"/>
+              </else-if>
             </choose>
-         </if>
-         <else-if type="webpage">
+          </group>
+          <text prefix=" " macro="publisher" suffix="."/>
+        </if>
+        <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+          <text macro="author-sort"/>
+          <group suffix=".">
+            <text macro="title"/>
             <choose>
-               <if variable="author">
-                  <text macro="author" suffix=" "/>
-                  <text macro="year-date" prefix="(" suffix=")"/>
-               </if>
-               <else-if variable="container-title">
-                  <text variable="container-title" suffix=". "/>
-                  <text macro="year-date" prefix="(" suffix=")"/>
-               </else-if>
+              <if variable="author editor" match="any"/>
+              <else>
+                <text macro="issued-general" prefix=" "/>
+              </else>
             </choose>
-         </else-if>
-         <else>
             <choose>
-               <if variable="author">
-                  <text macro="author" suffix=" "/>
-                  <text macro="issued-general" suffix=" "/>
-               </if>
-               <else-if variable="editor">
-                  <text macro="editor" suffix=" "/>
-                  <text macro="issued-general" suffix=" "/>
-               </else-if>
-               <else-if variable="publisher">
-                  <text variable="publisher" suffix=" "/>
-                  <text macro="issued-general" suffix=" "/>
-               </else-if>
+              <if variable="edition">
+                <text value=", "/>
+              </if>
             </choose>
-         </else>
-      </choose>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
-         <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="editor-short">
-      <names variable="editor" suffix=",">
-         <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
-      </names>
-   </macro>
-   <macro name="editor-in">
-      <names variable="editor">
-         <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
-         <label form="short" prefix=" " text-case="lowercase" strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="anon">
-      <text term="anonymous" form="short" strip-periods="true"/>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name name-as-sort-order="all" and="text" sort-separator=" " initialize-with="" delimiter-precedes-last="never" delimiter=", "/>
-         <label form="short" prefix=" " suffix="." text-case="lowercase" strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="author-short">
-      <names variable="author" suffix=",">
-         <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=""/>
-      </names>
-   </macro>
-   <macro name="access">
-      <choose>
-         <if variable="URL">
-            <text value="Available at" suffix=" "/>
-            <text variable="URL"/>
-            <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>
-         </if>
-      </choose>
-   </macro>
-   <macro name="title">
-      <text variable="title" font-style="italic"/>
-   </macro>
-   <macro name="title-article">
-      <text variable="title"/>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=": ">
-         <text variable="publisher-place"/>
-         <text variable="publisher"/>
-      </group>
-   </macro>
-   <macro name="issued-general">
-      <date variable="issued">
-         <date-part name="year" prefix="(" suffix=")"/>
-      </date>
-   </macro>
-   <macro name="year-date">
-      <choose>
-         <if variable="issued">
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else>
-            <text term="no date" form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="online-date">
-      <choose>
-         <if variable="issued">
-            <date variable="issued">
-               <date-part name="day" suffix=" "/>
-               <date-part name="month"/>
-            </date>
-         </if>
-         <else>
-            <text term="no date"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="edition">
-      <choose>
-         <if is-numeric="edition">
-            <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
-            </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="pages">
-      <group>
-         <label variable="page" form="short" suffix=" "/>
-         <text variable="page"/>
-      </group>
-   </macro>
-   <macro name="sort">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song broadcast thesis chapter paper-conference" match="any">
+            <text macro="edition"/>
             <choose>
-               <if variable="author">
-                  <text macro="author"/>
-               </if>
-               <else-if variable="editor">
-                  <text macro="editor"/>
-               </else-if>
-               <else>
-                  <text macro="title"/>
-               </else>
+              <if variable="author">
+                <text macro="editor"/>
+              </if>
             </choose>
-         </if>
-         <else-if type="webpage">
+          </group>
+          <text prefix=" " macro="publisher" suffix="."/>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="author-sort"/>
+          <text macro="title-article" suffix="."/>
+          <group delimiter=" ">
+            <text term="in" prefix=" " text-case="capitalize-first"/>
             <choose>
-               <if variable="author">
-                  <text macro="author"/>
-               </if>
-               <else-if variable="container-title">
-                  <text variable="container-title" suffix="."/>
-               </else-if>
-               <else>
-                  <text macro="title"/>
-               </else>
+              <if variable="author">
+                <text macro="editor-in"/>
+              </if>
             </choose>
-         </else-if>
-         <else>
+            <text variable="container-title" font-style="italic" suffix="."/>
+            <group suffix="." delimiter=", ">
+              <text macro="publisher"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <text macro="author-sort"/>
+          <group suffix="." delimiter=". ">
+            <text macro="title"/>
+            <text variable="genre"/>
+            <text macro="publisher" prefix=" " suffix="."/>
+          </group>
+        </else-if>
+        <else-if type="webpage">
+          <text macro="author-sort"/>
+          <text variable="title" prefix=" " suffix="."/>
+          <text variable="container-title" prefix=" " suffix="," font-style="italic"/>
+          <text macro="online-date" prefix=" " suffix="."/>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper" match="any">
+          <choose>
+            <if variable="author">
+              <text macro="author" suffix=" "/>
+              <text macro="issued-general" suffix=" "/>
+            </if>
+            <else-if variable="container-title">
+              <text variable="container-title" font-style="italic"/>
+              <text macro="year-date" prefix=" (" suffix=") "/>
+            </else-if>
+          </choose>
+          <group suffix=".">
+            <text macro="title-article"/>
+            <text macro="editor" prefix=" " suffix="."/>
+          </group>
+          <group prefix=" " suffix=".">
             <choose>
-               <if variable="author">
-                  <text macro="author"/>
-               </if>
-               <else-if variable="editor">
-                  <text macro="editor"/>
-               </else-if>
-               <else-if variable="publisher">
-                  <text variable="publisher" suffix="."/>
-               </else-if>
-               <else-if variable="container-title">
-                  <text variable="container-title" suffix="."/>
-               </else-if>
-               <else>
-                  <text macro="title"/>
-               </else>
+              <if variable="author">
+                <text variable="container-title" font-style="italic"/>
+                <text prefix=", " macro="online-date"/>
+              </if>
+              <else>
+                <text macro="online-date"/>
+              </else>
             </choose>
-         </else>
-      </choose>
-   </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">
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <group delimiter=", ">
+            <group prefix=" ">
+              <text variable="volume"/>
+              <text variable="issue" prefix="(" suffix=")"/>
+            </group>
+            <group prefix=", ">
+              <label variable="locator" suffix="." form="short" strip-periods="true"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <text macro="author-sort"/>
+          <group suffix=".">
+            <text macro="title"/>
+            <text macro="editor" prefix=" " suffix="."/>
+          </group>
+          <group prefix=" " suffix=".">
+            <text variable="container-title" font-style="italic"/>
             <choose>
-               <if variable="author">
-                  <text macro="author-short" suffix=" "/>
-                  <text macro="year-date"/>
-               </if>
-               <else-if variable="editor">
-                  <text macro="editor-short" suffix=" "/>
-                  <text macro="year-date"/>
-               </else-if>
+              <if type="article-newspaper">
+                <text prefix=", " macro="online-date"/>
+              </if>
             </choose>
-            <group>
-               <label variable="locator" suffix=". " form="short" strip-periods="true"/>
-               <text variable="locator"/>
+            <group prefix=", ">
+              <text variable="volume"/>
+              <text variable="issue" prefix="(" suffix=")"/>
             </group>
-         </group>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="false" et-al-min="3" et-al-use-first="1">
-      <sort>
-         <key macro="sort"/>
-         <key variable="issued"/>
-         <key variable="title"/>
-      </sort>
-      <layout>
-         <choose>
-            <if type="song motion_picture broadcast" match="any">
-               <text macro="author-sort"/>
-               <group delimiter=" " suffix=".">
-                  <text macro="title"/>
-                  <choose>
-                     <if type="song">
-                        <text value="audio recording" prefix="[" suffix="]"/>
-                     </if>
-                     <else-if type="motion_picture">
-                        <text value="film" prefix="[" suffix="]"/>
-                     </else-if>
-                     <else-if type="broadcast">
-                        <text value="broadcast" prefix="[" suffix="]"/>
-                     </else-if>
-                  </choose>
-               </group>
-               <text prefix=" " macro="publisher" suffix="."/>
-            </if>
-            <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-               <text macro="author-sort"/>
-               <group suffix=".">
-                  <text macro="title"/>
-                  <choose>
-                     <if variable="author editor" match="any"/>
-                     <else>
-                        <text macro="issued-general" prefix=" "/>
-                     </else>
-                  </choose>
-                  <choose>
-                     <if variable="edition">
-                        <text value=", "/>
-                     </if>
-                  </choose>
-                  <text macro="edition"/>
-                  <choose>
-                     <if variable="author">
-                        <text macro="editor"/>
-                     </if>
-                  </choose>
-               </group>
-               <text prefix=" " macro="publisher" suffix="."/>
-            </else-if>
-            <else-if type="chapter paper-conference" match="any">
-               <text macro="author-sort"/>
-               <text macro="title-article" suffix="."/>
-               <group delimiter=" ">
-                  <text term="in" prefix=" " text-case="capitalize-first"/>
-                  <choose>
-                     <if variable="author">
-                        <text macro="editor-in"/>
-                     </if>
-                  </choose>
-                  <text variable="container-title" font-style="italic" suffix="."/>
-                  <group suffix="." delimiter=", ">
-                     <text macro="publisher"/>
-                     <text macro="pages"/>
-                  </group>
-               </group>
-            </else-if>
-            <else-if type="thesis">
-               <text macro="author-sort"/>
-               <group suffix="." delimiter=". ">
-                  <text macro="title"/>
-                  <text variable="genre"/>
-                  <text macro="publisher" prefix=" " suffix="."/>
-               </group>
-            </else-if>
-            <else-if type="webpage">
-               <text macro="author-sort"/>
-               <text variable="title" prefix=" " suffix="."/>
-               <text variable="container-title" prefix=" " suffix="," font-style="italic"/>
-               <text macro="online-date" prefix=" " suffix="."/>
-            </else-if>
-            <else-if type="article-journal article-magazine article-newspaper" match="any">
-               <choose>
-                  <if variable="author">
-                     <text macro="author" suffix=" "/>
-                     <text macro="issued-general" suffix=" "/>
-                  </if>
-                  <else-if variable="container-title">
-                     <text variable="container-title" font-style="italic"/>
-                     <text macro="year-date" prefix=" (" suffix=") "/>
-                  </else-if>
-               </choose>
-               <group suffix=".">
-                  <text macro="title-article"/>
-                  <text macro="editor" prefix=" " suffix="."/>
-               </group>
-               <group prefix=" " suffix=".">
-                  <choose>
-                     <if variable="author">
-                        <text variable="container-title" font-style="italic"/>
-                        <text prefix=", " macro="online-date"/>
-                     </if>
-                     <else>
-                        <text macro="online-date"/>
-                     </else>
-                  </choose>
-                  <group prefix=" ">
-                     <text variable="volume"/>
-                     <text variable="issue" prefix="(" suffix=")"/>
-                  </group>
-                  <group prefix=", ">
-                     <label variable="locator" suffix="." form="short" strip-periods="true"/>
-                     <text macro="pages"/>
-                  </group>
-               </group>
-            </else-if>
-            <else>
-               <text macro="author-sort"/>
-               <group suffix=".">
-                  <text macro="title"/>
-                  <text macro="editor" prefix=" " suffix="."/>
-               </group>
-               <group prefix=" " suffix=".">
-                  <text variable="container-title" font-style="italic"/>
-                  <choose>
-                     <if type="article-newspaper">
-                        <text prefix=", " macro="online-date"/>
-                     </if>
-                  </choose>
-                  <group prefix=", ">
-                     <text variable="volume"/>
-                     <text variable="issue" prefix="(" suffix=")"/>
-                  </group>
-                  <group prefix=", ">
-                     <label variable="locator" suffix="." form="short" strip-periods="true"/>
-                     <text macro="pages"/>
-                  </group>
-               </group>
-            </else>
-         </choose>
-         <text prefix=" " macro="access" suffix="."/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+            <group prefix=", ">
+              <label variable="locator" suffix="." form="short" strip-periods="true"/>
+              <text macro="pages"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/fachhochschule-vorarlberg.csl b/fachhochschule-vorarlberg.csl
index 087f5d6eae..9ae3869383 100644
--- a/fachhochschule-vorarlberg.csl
+++ b/fachhochschule-vorarlberg.csl
@@ -22,10 +22,11 @@
     <summary>Citation Style of the University of Applied Sciences Vorarlberg, based on A Harvard author-date style variant, mostly german</summary>
     <link href="http://www.fhv.at/fhv/lib/wiss/wissarb.pdf" rel="documentation"/>
     <!--  useful things: non breaking space: &#160;   -->
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <macro name="author">
     <names variable="author" delimiter="; ">
-      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long" suffix="&#160;"/>
+      <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long" suffix=" "/>
       <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
       <substitute>
         <text macro="editor"/>
@@ -36,7 +37,7 @@
   </macro>
   <macro name="author-short">
     <names variable="author" delimiter="; ">
-      <name form="short" delimiter=";&#160;" initialize-with=". " delimiter-precedes-last="always" sort-separator="," suffix="&#160;"/>
+      <name form="short" delimiter="; " initialize-with=". " delimiter-precedes-last="always" sort-separator="," suffix=" "/>
       <substitute>
         <names variable="editor"/>
         <names variable="translator"/>
@@ -47,45 +48,45 @@
   <macro name="editor">
     <names variable="editor" delimiter="; ">
       <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always" form="long" suffix=""/>
-      <label form="short" prefix=" (" suffix=".):&#160;" strip-periods="true"/>
+      <label form="short" prefix=" (" suffix=".): " strip-periods="true"/>
     </names>
   </macro>
   <macro name="anon">
     <choose>
       <if variable="author editor translator" match="none">
-        <text term="anonymous" form="short" suffix="&#160;" strip-periods="true"/>
+        <text term="anonymous" form="short" suffix=" " strip-periods="true"/>
       </if>
     </choose>
   </macro>
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case motion_picture report song" match="any">
-        <text variable="title" font-style="normal" suffix=".&#160;"/>
+        <text variable="title" font-style="normal" suffix=". "/>
       </if>
       <else-if type="chapter paper-conference" match="any">
-        <text variable="title" font-style="normal" prefix="&#8222;" suffix=".&#8220; "/>
+        <text variable="title" font-style="normal" prefix="„" suffix=".“ "/>
       </else-if>
       <else-if type="webpage">
-        <text variable="title" font-style="normal" suffix=".&#160;"/>
+        <text variable="title" font-style="normal" suffix=". "/>
       </else-if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
-        <text variable="title" font-style="normal" prefix="&#8222;" suffix=".&#8220; "/>
+        <text variable="title" font-style="normal" prefix="„" suffix=".“ "/>
       </else-if>
       <else>
-        <text variable="title" font-style="normal" prefix="&#160;" suffix="&#160;"/>
+        <text variable="title" font-style="normal" prefix=" " suffix=" "/>
       </else>
     </choose>
   </macro>
   <macro name="collection-title">
     <choose>
       <if type="article-journal">
-        <text variable="collection-title" prefix="&#160;(=&#160;" suffix="),&#160;"/>
+        <text variable="collection-title" prefix=" (= " suffix="), "/>
       </if>
       <else-if type="bill book graphic legal_case motion_picture report song article-newspaper webpage chapter paper-conference" match="any">
-        <text variable="collection-title" prefix="&#160;(=&#160;" suffix=")"/>
+        <text variable="collection-title" prefix=" (= " suffix=")"/>
       </else-if>
       <else>
-        <text value="o.&#160;J."/>
+        <text value="o. J."/>
       </else>
     </choose>
   </macro>
@@ -110,7 +111,7 @@
       <else-if type="bill book graphic legal_case motion_picture report song article-journal article-newspaper chapter paper-conference" match="any">
         <choose>
           <if variable="URL">
-            <text value=".&#160;Online im Internet: "/>
+            <text value=". Online im Internet: "/>
             <text variable="URL"/>
             <group prefix=" (" delimiter=" " suffix=")">
               <text value="Zugriff am:"/>
@@ -135,7 +136,7 @@
     <choose>
       <if type="article-newspaper">
         <date variable="issued">
-          <date-part name="day" form="numeric" suffix=".&#160;"/>
+          <date-part name="day" form="numeric" suffix=". "/>
           <date-part name="month" form="long" suffix=" "/>
           <date-part name="year" form="long"/>
         </date>
@@ -150,32 +151,32 @@
         </date>
       </if>
       <else>
-        <text value="o.&#160;J."/>
+        <text value="o. J."/>
       </else>
     </choose>
   </macro>
   <macro name="locator">
     <choose>
       <if type="article-journal">
-        <text variable="volume" prefix="" suffix="&#160;"/>
+        <text variable="volume" prefix="" suffix=" "/>
         <date variable="issued">
           <date-part name="year" prefix="(" suffix=")"/>
         </date>
-        <text variable="issue" prefix=",&#160;" suffix=""/>
+        <text variable="issue" prefix=", " suffix=""/>
       </if>
       <else-if type="article-newspaper">
-        <text variable="volume" prefix=",&#160;" suffix="&#160;"/>
+        <text variable="volume" prefix=", " suffix=" "/>
         <!-- <date variable="issued">
                     <date-part name="year" prefix="(" suffix=")"/>
                   </date> -->
-        <text variable="issue" prefix=",&#160;" suffix=""/>
+        <text variable="issue" prefix=", " suffix=""/>
       </else-if>
     </choose>
   </macro>
   <macro name="pages">
     <choose>
       <if type="chapter paper-conference article-journal article-newspaper" match="any">
-        <label variable="page" form="short" prefix=",&#160;" suffix=".&#160;" strip-periods="true"/>
+        <label variable="page" form="short" prefix=", " suffix=". " strip-periods="true"/>
         <text variable="page"/>
       </if>
     </choose>
@@ -184,34 +185,34 @@
     <choose>
       <if is-numeric="edition">
         <group delimiter=" ">
-          <number variable="edition" form="numeric" suffix=". Aufl.&#160;"/>
+          <number variable="edition" form="numeric" suffix=". Aufl. "/>
         </group>
       </if>
       <else>
-        <text variable="edition" suffix=".&#160;"/>
+        <text variable="edition" suffix=". "/>
       </else>
     </choose>
   </macro>
   <macro name="container-prefix">
     <choose>
       <if type="chapter paper-conference article-journal article-magazine article-newspaper" match="any">
-        <text term="in" text-case="capitalize-first" suffix=":&#160;"/>
+        <text term="in" text-case="capitalize-first" suffix=": "/>
       </if>
     </choose>
   </macro>
   <macro name="container-title">
     <choose>
       <if type="chapter paper-conference" match="any">
-        <text variable="container-title" font-style="normal" suffix=".&#160;"/>
+        <text variable="container-title" font-style="normal" suffix=". "/>
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
-        <text variable="container-title" font-style="normal" suffix=",&#160;"/>
+        <text variable="container-title" font-style="normal" suffix=", "/>
       </else-if>
       <else-if type="webpage">
-        <text variable="container-title" font-style="normal" suffix=".&#160;"/>
+        <text variable="container-title" font-style="normal" suffix=". "/>
       </else-if>
       <else>
-        <text variable="container-title" font-style="normal" suffix="&#160;"/>
+        <text variable="container-title" font-style="normal" suffix=" "/>
       </else>
     </choose>
   </macro>
@@ -220,7 +221,7 @@
     <layout prefix="(" suffix=")" delimiter="; ">
       <text macro="author-short"/>
       <text macro="year-date"/>
-      <text variable="locator" prefix=",&#160;S.&#160;"/>
+      <text variable="locator" prefix=", S. "/>
     </layout>
   </citation>
   <!-- Hier beginnt die Formatierung für das Literaturverzeichnis -  this is where the bibliography starts -->
@@ -231,7 +232,7 @@
     </sort>
     <layout suffix=".">
       <text macro="author"/>
-      <text macro="year-date" prefix="(" suffix="):&#160;"/>
+      <text macro="year-date" prefix="(" suffix="): "/>
       <text macro="title"/>
       <text macro="container-prefix"/>
       <text macro="editor"/>
diff --git a/geological-magazine.csl b/geological-magazine.csl
index e362ecf0af..743b3a99ec 100644
--- a/geological-magazine.csl
+++ b/geological-magazine.csl
@@ -13,6 +13,7 @@
     <updated>2011-11-19T13:20:00+01:00</updated>
     <summary>Style for the Geological Magazine by Cambridge University Press</summary>
     <link href="http://journals.cambridge.org/action/displayMoreInfo?jid=GEO&amp;type=ifc" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <macro name="editor">
     <names variable="editor" delimiter=", ">
@@ -36,9 +37,9 @@
   <macro name="author-count">
     <names variable="author">
       <name form="count"/>
-        <substitute>
-          <names variable="editor"/>
-        </substitute>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
     </names>
   </macro>
   <macro name="author-short">
diff --git a/harvard-cardiff-uni.csl b/harvard-cardiff-uni.csl
index 1519c9b386..43c44beb83 100644
--- a/harvard-cardiff-uni.csl
+++ b/harvard-cardiff-uni.csl
@@ -12,6 +12,7 @@
     <updated>2009-02-06T18:22:33+00:00</updated>
     <summary>The Harvard author-date style - adapted for Cardiff University</summary>
     <link href="http://www.cardiff.ac.uk/insrv/resources/guides/inf057.pdf" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <macro name="editor">
     <names variable="editor" delimiter=", ">
@@ -188,4 +189,4 @@
       </choose>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/ieee-w-url.csl b/ieee-w-url.csl
index 32f3ec5b4e..ef11c16c3e 100644
--- a/ieee-w-url.csl
+++ b/ieee-w-url.csl
@@ -1,137 +1,138 @@
 <?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">
-   <info>
-      <title>IEEE with URL</title>
-      <id>http://www.zotero.org/styles/ieee-w-url</id>
-      <link href="http://www.zotero.org/styles/ieee-w-url" rel="self"/>
-      <author>
-         <name>Michael Berkowitz</name>
-         <email>mberkowi@gmu.edu</email>
-      </author>
-      <contributor>
-         <name>Julian Onions</name>
-         <email>julian.onions@gmail.com</email>
-      </contributor>
-      <contributor>
-         <name>Rintze Zelle</name>
-         <uri>http://twitter.com/rintzezelle</uri>
-      </contributor>
-      <category field="engineering"/>
-      <category field="generic-base"/>
-      <category citation-format="numeric"/>
-      <updated>2009-11-19T11:34:34+00:00</updated>
-      <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
-   </info>
-   <macro name="author">
-      <names variable="author">
-         <name initialize-with="." delimiter=", " and="text"/>
-         <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name initialize-with="." delimiter=", " and="text"/>
-         <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="title">
+  <info>
+    <title>IEEE with URL</title>
+    <id>http://www.zotero.org/styles/ieee-w-url</id>
+    <link href="http://www.zotero.org/styles/ieee-w-url" rel="self"/>
+    <author>
+      <name>Michael Berkowitz</name>
+      <email>mberkowi@gmu.edu</email>
+    </author>
+    <contributor>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </contributor>
+    <contributor>
+      <name>Rintze Zelle</name>
+      <uri>http://twitter.com/rintzezelle</uri>
+    </contributor>
+    <category field="engineering"/>
+    <category field="generic-base"/>
+    <category citation-format="numeric"/>
+    <updated>2009-11-19T11:34:34+00:00</updated>
+    <link href="http://www.ieee.org/portal/cms_docs_iportals/iportals/publications/authors/transjnl/stylemanual.pdf" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name initialize-with="." delimiter=", " and="text"/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name initialize-with="." delimiter=", " and="text"/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="." strip-periods="true"/>
+    </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" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place" suffix=": " prefix=" "/>
+    <text variable="publisher" suffix=", "/>
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="access">
+    <text value="Available" suffix=": "/>
+    <text variable="URL"/>
+  </macro>
+  <macro name="page">
+    <group>
+      <label variable="page" form="short" suffix=". " strip-periods="true"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" second-field-align="flush">
+    <layout suffix=".">
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" prefix=" " suffix=", "/>
       <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" quotes="true"/>
-         </else>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="editor"/>
+            <text macro="publisher"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <text macro="title" suffix=", "/>
+          <text variable="number" prefix="U.S. Patent "/>
+          <date variable="issued" prefix=", ">
+            <date-part name="month" suffix=" "/>
+            <date-part name="day" suffix=", "/>
+            <date-part name="year"/>
+          </date>
+        </else-if>
+        <else-if type="thesis">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="genre"/>
+            <text variable="publisher"/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
+        </else-if>
+        <else-if type="webpage">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+          </group>
+          <text macro="access" prefix=" "/>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <text variable="volume" prefix=" vol. "/>
+            <date variable="issued">
+              <date-part name="month" form="short" suffix=". " strip-periods="true"/>
+              <date-part name="year"/>
+            </date>
+            <text macro="page"/>
+          </group>
+        </else>
       </choose>
-   </macro>
-   <macro name="publisher">
-      <text variable="publisher-place" suffix=": " prefix=" "/>
-      <text variable="publisher" suffix=", "/>
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="access">
-      <text value="Available" suffix=": "/>
-      <text variable="URL"/>
-   </macro>
-   <macro name="page">
-      <group>
-         <label variable="page" form="short" suffix=". " strip-periods="true"/>
-         <text variable="page"/>
-      </group>
-   </macro>
-   <citation et-al-min="3" et-al-use-first="1" collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout prefix="[" suffix="]" delimiter=",">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography entry-spacing="0" second-field-align="flush">
-      <layout suffix=".">
-         <text variable="citation-number" prefix="[" suffix="]"/>
-         <text macro="author" prefix=" " suffix=", "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text macro="publisher"/>
-               </group>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text variable="container-title" font-style="italic"/>
-                  <text macro="editor"/>
-                  <text macro="publisher"/>
-                  <text macro="page"/>
-               </group>
-            </else-if>
-            <else-if type="patent">
-               <text macro="title" suffix=", "/>
-               <text variable="number" prefix="U.S. Patent "/>
-               <date variable="issued" prefix=", ">
-                  <date-part name="month" suffix=" "/>
-                  <date-part name="day" suffix=", "/>
-                  <date-part name="year"/>
-               </date>
-            </else-if>
-            <else-if type="thesis">
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text variable="genre"/>
-                  <text variable="publisher"/>
-                  <date variable="issued">
-                     <date-part name="year"/>
-                  </date>
-               </group>
-            </else-if>
-            <else-if type="webpage">
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text variable="container-title" font-style="italic"/>
-               </group>
-               <text macro="access" prefix=" "/>
-            </else-if>
-            <else>
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text variable="container-title" font-style="italic"/>
-                  <text variable="volume" prefix=" vol. "/>
-                  <date variable="issued">
-                     <date-part name="month" form="short" suffix=". " strip-periods="true"/>
-                     <date-part name="year"/>
-                  </date>
-                  <text macro="page"/>
-               </group>
-            </else>
-         </choose>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </layout>
+  </bibliography>
+</style>
diff --git a/inter-ro.csl b/inter-ro.csl
index b23645a43e..1b915b2fbb 100644
--- a/inter-ro.csl
+++ b/inter-ro.csl
@@ -1,326 +1,327 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>Romanian Institute for Inter-Orthodox, Inter-Confessional and Inter-Religious Studies (INTER)</title>
-      <id>http://www.zotero.org/styles/inter-ro</id>
-      <link href="http://www.zotero.org/styles/inter-ro" rel="self"/>
-      <author>
-         <name>Nicolae Turcan</name>
-         <email>nturcan@gmail.com</email>
-      </author>
-      <summary>Romanian INTER Institute format with full notes and bibliography</summary>
-      <category field="theology"/>
-      <category citation-format="numeric"/>
-      <updated>2010-02-10T14:24:43+00:00</updated>
-   </info>
-   <macro name="editor">
-      <names variable="editor" delimiter=", ">
-         <label form="verb" text-case="lowercase"/>
-         <name delimiter=", " prefix=" " delimiter-precedes-last="always" font-variant="small-caps"/>
-      </names>
-   </macro>
-   <macro name="translator">
-      <names variable="translator" delimiter=", ">
-         <label form="verb" text-case="lowercase"/>
-         <name prefix=" " and="text" delimiter=", " delimiter-precedes-last="never"/>
-      </names>
-   </macro>
-   <macro name="editor-short">
+  <info>
+    <title>Romanian Institute for Inter-Orthodox, Inter-Confessional and Inter-Religious Studies (INTER)</title>
+    <id>http://www.zotero.org/styles/inter-ro</id>
+    <link href="http://www.zotero.org/styles/inter-ro" rel="self"/>
+    <author>
+      <name>Nicolae Turcan</name>
+      <email>nturcan@gmail.com</email>
+    </author>
+    <summary>Romanian INTER Institute format with full notes and bibliography</summary>
+    <category field="theology"/>
+    <category citation-format="numeric"/>
+    <updated>2010-02-10T14:24:43+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="verb" text-case="lowercase"/>
+      <name delimiter=", " prefix=" " delimiter-precedes-last="always" font-variant="small-caps"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator" delimiter=", ">
+      <label form="verb" text-case="lowercase"/>
+      <name prefix=" " and="text" delimiter=", " delimiter-precedes-last="never"/>
+    </names>
+  </macro>
+  <macro name="editor-short">
+    <choose>
+      <if variable="author">
+        <names variable="editor" delimiter=", ">
+          <name delimiter=", " delimiter-precedes-last="always" font-variant="small-caps"/>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=".)" strip-periods="true"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter=", " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
+      <substitute>
+        <names variable="editor" font-variant="small-caps"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-bib">
+    <names variable="author">
+      <name name-as-sort-order="all" form="long" delimiter="; " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
+      <substitute>
+        <names variable="editor" font-variant="small-caps"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <text variable="URL" text-decoration="underline"/>
+        <group>
+          <text term="accessed" text-case="lowercase" prefix=", " suffix=":"/>
+          <date variable="accessed" prefix=" ">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month" suffix=" " text-case="lowercase"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </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" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic" form="short"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="graphic report" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" suffix=" " text-case="lowercase"/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" 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=" " text-case="lowercase"/>
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <group>
+      <label variable="locator" suffix="." form="short" strip-periods="true"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" suffix="." strip-periods="true"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" suffix="." form="short" strip-periods="true"/>
+      <text variable="page" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="sort-key">
+    <text macro="author-bib" suffix=" "/>
+    <text variable="issue" suffix=" "/>
+    <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="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout prefix="" suffix="." delimiter="; ">
       <choose>
-         <if variable="author">
-            <names variable="editor" delimiter=", ">
-               <name delimiter=", " delimiter-precedes-last="always" font-variant="small-caps"/>
-               <label form="short" text-case="lowercase" prefix=" (" suffix=".)" strip-periods="true"/>
-            </names>
-         </if>
-      </choose>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name delimiter=", " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
-         <substitute>
-            <names variable="editor" font-variant="small-caps"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="author-bib">
-      <names variable="author">
-         <name name-as-sort-order="all" form="long" delimiter="; " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
-         <substitute>
-            <names variable="editor" font-variant="small-caps"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="recipient">
-      <names variable="recipient" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="interviewer">
-      <names variable="interviewer" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="access">
-      <choose>
-         <if variable="URL">
-            <text variable="URL" text-decoration="underline"/>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" form="long" font-style="italic"/>
+            <text macro="locators"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" form="long" font-style="italic"/>
+        </else-if>
+        <else-if position="subsequent">
+          <group delimiter=", ">
             <group>
-               <text term="accessed" text-case="lowercase" prefix=", " suffix=":"/>
-               <date variable="accessed" prefix=" ">
-                  <date-part name="day" suffix=" "/>
-                  <date-part name="month" suffix=" " text-case="lowercase"/>
-                  <date-part name="year"/>
-               </date>
+              <text macro="author"/>
+              <text macro="recipient"/>
             </group>
-         </if>
-      </choose>
-   </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" quotes="true"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="title-short">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic" form="short"/>
-         </if>
-         <else>
-            <text variable="title" quotes="true" form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=", ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
-      </group>
-   </macro>
-   <macro name="issued">
-      <choose>
-         <if type="graphic report" match="any">
-            <date variable="issued">
-               <date-part name="day" suffix=" "/>
-               <date-part name="month" suffix=" " text-case="lowercase"/>
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" 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=" " text-case="lowercase"/>
-               <date-part name="year"/>
-            </date>
-         </else>
-      </choose>
-   </macro>
-   <macro name="locators">
-      <group>
-         <label variable="locator" suffix="." form="short" strip-periods="true"/>
-         <text variable="locator" prefix=" "/>
-      </group>
-   </macro>
-   <macro name="volume">
-      <group delimiter=" ">
-         <text term="volume" form="short" suffix="." strip-periods="true"/>
-         <text variable="volume"/>
-      </group>
-   </macro>
-   <macro name="pages">
-      <group>
-         <label variable="page" suffix="." form="short" strip-periods="true"/>
-         <text variable="page" prefix=" "/>
-      </group>
-   </macro>
-   <macro name="sort-key">
-      <text macro="author-bib" suffix=" "/>
-      <text variable="issue" suffix=" "/>
-      <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="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
-      <layout prefix="" suffix="." delimiter="; ">
-         <choose>
-            <if position="ibid-with-locator">
-               <group delimiter=", ">
-                  <text term="ibid" form="long" font-style="italic"/>
-                  <text macro="locators"/>
-               </group>
-            </if>
-            <else-if position="ibid">
-               <text term="ibid" form="long" font-style="italic"/>
-            </else-if>
-            <else-if position="subsequent">
-               <group delimiter=", ">
-                  <group>
-                     <text macro="author"/>
-                     <text macro="recipient"/>
-                  </group>
-                  <group delimiter=", ">
-                     <text macro="title-short"/>
-                     <text macro="volume"/>
-                  </group>
-                  <choose>
-                     <if type="interview">
-                        <text term="interview" text-case="lowercase"/>
-                     </if>
-                     <else-if variable="recipient">
-                        <text macro="issued"/>
-                     </else-if>
-                  </choose>
-                  <text macro="locators"/>
-               </group>
-            </else-if>
-            <else>
-               <group suffix=", ">
-                  <text macro="author"/>
-                  <text macro="recipient"/>
-               </group>
-               <text macro="title"/>
-               <choose>
-                  <if type="chapter paper-conference" match="any">
-                     <group>
-                        <text term="in" text-case="lowercase" prefix=", "/>
-                        <group delimiter=", " prefix="">
-                           <text macro="editor-short"/>
-                           <text variable="container-title" font-style="italic"/>
-                        </group>
-                        <text macro="volume" prefix=", "/>
-                        <group prefix=" (= " suffix=")" delimiter=" ">
-                           <text variable="collection-title"/>
-                           <text variable="collection-number"/>
-                        </group>
-                     </group>
-                     <text macro="translator" prefix=", "/>
-                     <text variable="edition" prefix=", "/>
-                     <text macro="publisher" prefix=", "/>
-                     <text macro="issued" prefix=", "/>
-                  </if>
-                  <else-if type="article-journal article-newspaper article-magazine" match="any">
-                     <group>
-                        <group delimiter=" ">
-                           <text variable="container-title" font-style="italic" prefix=", "/>
-                           <group delimiter=", ">
-                              <text variable="volume"/>
-                              <text variable="issue"/>
-                           </group>
-                           <text macro="issued" prefix="(" suffix=")"/>
-                        </group>
-                        <text macro="editor" prefix=", "/>
-                        <text macro="translator" prefix=", "/>
-                        <text variable="edition" prefix=", "/>
-                        <text macro="publisher" prefix=", "/>
-                     </group>
-                  </else-if>
-                  <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-                     <group>
-                        <text macro="volume" prefix=", "/>
-                        <group prefix=" (= " suffix=")" delimiter=" ">
-                           <text variable="collection-title"/>
-                           <text variable="collection-number"/>
-                        </group>
-                     </group>
-                     <text macro="translator" prefix=", "/>
-                     <text macro="editor" prefix=", "/>
-                     <text variable="edition" prefix=", "/>
-                     <text macro="publisher" prefix=", "/>
-                     <text macro="issued" prefix=", "/>
-                  </else-if>
-                  <else>
-                     <group>
-                        <text variable="container-title" font-style="italic" prefix=", "/>
-                        <text variable="volume" prefix=" "/>
-                        <text variable="issue" prefix=", "/>
-                     </group>
-                  </else>
-               </choose>
-               <text macro="locators" prefix=", "/>
-               <text macro="access" prefix=", "/>
-            </else>
-         </choose>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" entry-spacing="0">
-      <sort>
-         <key macro="sort-key"/>
-      </sort>
-      <layout suffix=".">
-         <text macro="author-bib" suffix=", "/>
-         <text macro="title"/>
-         <choose>
+            <group delimiter=", ">
+              <text macro="title-short"/>
+              <text macro="volume"/>
+            </group>
+            <choose>
+              <if type="interview">
+                <text term="interview" text-case="lowercase"/>
+              </if>
+              <else-if variable="recipient">
+                <text macro="issued"/>
+              </else-if>
+            </choose>
+            <text macro="locators"/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix=", ">
+            <text macro="author"/>
+            <text macro="recipient"/>
+          </group>
+          <text macro="title"/>
+          <choose>
             <if type="chapter paper-conference" match="any">
-               <group>
-                  <text term="in" text-case="lowercase" prefix=", "/>
-                  <group delimiter=", " prefix="">
-                     <text macro="editor-short"/>
-                     <text variable="container-title" font-style="italic"/>
-                  </group>
-                  <text macro="volume" prefix=", "/>
-                  <group prefix=" (= " suffix=")" delimiter=" ">
-                     <text variable="collection-title"/>
-                     <text variable="collection-number"/>
-                  </group>
-               </group>
-               <text macro="translator" prefix=", "/>
-               <text variable="edition" prefix=", "/>
-               <text macro="publisher" prefix=", "/>
-               <text macro="issued" prefix=", "/>
-               <group>
-                  <label variable="page" form="short" prefix=", "/>
-                  <text variable="page" prefix=" "/>
-               </group>
+              <group>
+                <text term="in" text-case="lowercase" prefix=", "/>
+                <group delimiter=", " prefix="">
+                  <text macro="editor-short"/>
+                  <text variable="container-title" font-style="italic"/>
+                </group>
+                <text macro="volume" prefix=", "/>
+                <group prefix=" (= " suffix=")" delimiter=" ">
+                  <text variable="collection-title"/>
+                  <text variable="collection-number"/>
+                </group>
+              </group>
+              <text macro="translator" prefix=", "/>
+              <text variable="edition" prefix=", "/>
+              <text macro="publisher" prefix=", "/>
+              <text macro="issued" prefix=", "/>
             </if>
             <else-if type="article-journal article-newspaper article-magazine" match="any">
-               <group delimiter=" ">
+              <group>
+                <group delimiter=" ">
                   <text variable="container-title" font-style="italic" prefix=", "/>
                   <group delimiter=", ">
-                     <text variable="volume"/>
-                     <text variable="issue"/>
+                    <text variable="volume"/>
+                    <text variable="issue"/>
                   </group>
                   <text macro="issued" prefix="(" suffix=")"/>
-               </group>
-               <text macro="editor" prefix=", "/>
-               <text macro="translator" prefix=", "/>
-               <text variable="edition" prefix=", "/>
-               <text macro="publisher" prefix=", "/>
-               <text macro="pages" prefix=", "/>
+                </group>
+                <text macro="editor" prefix=", "/>
+                <text macro="translator" prefix=", "/>
+                <text variable="edition" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+              </group>
             </else-if>
             <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-               <group>
-                  <text macro="volume" prefix=", "/>
-                  <group prefix=" (= " suffix=")" delimiter=" ">
-                     <text variable="collection-title"/>
-                     <text variable="collection-number"/>
-                  </group>
-               </group>
-               <text macro="translator" prefix=", "/>
-               <text macro="editor" prefix=", "/>
-               <text variable="edition" prefix=", "/>
-               <text macro="publisher" prefix=", "/>
-               <text macro="issued" prefix=", "/>
+              <group>
+                <text macro="volume" prefix=", "/>
+                <group prefix=" (= " suffix=")" delimiter=" ">
+                  <text variable="collection-title"/>
+                  <text variable="collection-number"/>
+                </group>
+              </group>
+              <text macro="translator" prefix=", "/>
+              <text macro="editor" prefix=", "/>
+              <text variable="edition" prefix=", "/>
+              <text macro="publisher" prefix=", "/>
+              <text macro="issued" prefix=", "/>
             </else-if>
             <else>
-               <group>
-                  <text variable="container-title" font-style="italic" prefix=", "/>
-                  <text macro="volume" prefix=", "/>
-                  <text variable="issue" prefix=", "/>
-               </group>
+              <group>
+                <text variable="container-title" font-style="italic" prefix=", "/>
+                <text variable="volume" prefix=" "/>
+                <text variable="issue" prefix=", "/>
+              </group>
             </else>
-         </choose>
-         <text macro="locators" prefix=", "/>
-         <text macro="access" prefix=", "/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+          </choose>
+          <text macro="locators" prefix=", "/>
+          <text macro="access" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" entry-spacing="0">
+    <sort>
+      <key macro="sort-key"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author-bib" suffix=", "/>
+      <text macro="title"/>
+      <choose>
+        <if type="chapter paper-conference" match="any">
+          <group>
+            <text term="in" text-case="lowercase" prefix=", "/>
+            <group delimiter=", " prefix="">
+              <text macro="editor-short"/>
+              <text variable="container-title" font-style="italic"/>
+            </group>
+            <text macro="volume" prefix=", "/>
+            <group prefix=" (= " suffix=")" delimiter=" ">
+              <text variable="collection-title"/>
+              <text variable="collection-number"/>
+            </group>
+          </group>
+          <text macro="translator" prefix=", "/>
+          <text variable="edition" prefix=", "/>
+          <text macro="publisher" prefix=", "/>
+          <text macro="issued" prefix=", "/>
+          <group>
+            <label variable="page" form="short" prefix=", "/>
+            <text variable="page" prefix=" "/>
+          </group>
+        </if>
+        <else-if type="article-journal article-newspaper article-magazine" match="any">
+          <group delimiter=" ">
+            <text variable="container-title" font-style="italic" prefix=", "/>
+            <group delimiter=", ">
+              <text variable="volume"/>
+              <text variable="issue"/>
+            </group>
+            <text macro="issued" prefix="(" suffix=")"/>
+          </group>
+          <text macro="editor" prefix=", "/>
+          <text macro="translator" prefix=", "/>
+          <text variable="edition" prefix=", "/>
+          <text macro="publisher" prefix=", "/>
+          <text macro="pages" prefix=", "/>
+        </else-if>
+        <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group>
+            <text macro="volume" prefix=", "/>
+            <group prefix=" (= " suffix=")" delimiter=" ">
+              <text variable="collection-title"/>
+              <text variable="collection-number"/>
+            </group>
+          </group>
+          <text macro="translator" prefix=", "/>
+          <text macro="editor" prefix=", "/>
+          <text variable="edition" prefix=", "/>
+          <text macro="publisher" prefix=", "/>
+          <text macro="issued" prefix=", "/>
+        </else-if>
+        <else>
+          <group>
+            <text variable="container-title" font-style="italic" prefix=", "/>
+            <text macro="volume" prefix=", "/>
+            <text variable="issue" prefix=", "/>
+          </group>
+        </else>
+      </choose>
+      <text macro="locators" prefix=", "/>
+      <text macro="access" prefix=", "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/ipvs.csl b/ipvs.csl
index 780d91fc44..5965ebc709 100644
--- a/ipvs.csl
+++ b/ipvs.csl
@@ -1,80 +1,81 @@
 <?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">
-   <info>
-      <title>International Pig Veterinary Society Proceeding</title>
-      <id>http://www.zotero.org/styles/ipvs</id>
-      <link href="http://www.zotero.org/styles/ipvs" rel="self"/>
-      <summary>International Pig Veterinary Society Proceeding Style</summary>
-      <author>
-         <name>Vincent Auvigne</name>
-         <email>vincent.auvigne@ekipaj.com</email>
-      </author>
-      <category field="medicine"/>
-      <category citation-format="numeric"/>
-      <updated>2009-09-01T16:54:42+00:00</updated>
-   </info>
-   <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="author">
-      <names variable="author">
-         <name sort-separator=", " delimiter=", " and="symbol" initialize-with="." delimiter-precedes-last="never" name-as-sort-order="all"/>
-      </names>
-   </macro>
-   <macro name="access">
-      <choose>
-         <if variable="volume"/>
-         <else-if variable="DOI">
-            <text variable="DOI" prefix="doi:"/>
-         </else-if>
-         <else-if variable="URL">
-            <text term="at"/>
-            <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="issuance">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <group prefix=" " suffix=".">
-               <text variable="publisher" suffix=", "/>
-               <text variable="publisher-place" suffix=", "/>
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
-               <text variable="number-of-pages" prefix=", " suffix=" p."/>
-            </group>
-         </if>
-         <else>
-            <date prefix=" (" suffix=")." variable="issued">
-               <date-part name="year"/>
-            </date>
-         </else>
-      </choose>
-   </macro>
-   <citation collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout vertical-align="baseline" delimiter="," prefix="(" suffix=")">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography et-al-min="2" et-al-use-first="1" second-field-align="flush" entry-spacing="0">
-      <layout>
-         <text variable="citation-number" suffix="."/>
-         <text macro="author"/>
-         <text macro="issuance"/>
-         <text variable="container-title" font-style="normal" prefix=" " suffix=", " form="short"/>
-         <text variable="volume" suffix=", " font-weight="normal"/>
-         <text variable="page"/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+  <info>
+    <title>International Pig Veterinary Society Proceeding</title>
+    <id>http://www.zotero.org/styles/ipvs</id>
+    <link href="http://www.zotero.org/styles/ipvs" rel="self"/>
+    <summary>International Pig Veterinary Society Proceeding Style</summary>
+    <author>
+      <name>Vincent Auvigne</name>
+      <email>vincent.auvigne@ekipaj.com</email>
+    </author>
+    <category field="medicine"/>
+    <category citation-format="numeric"/>
+    <updated>2009-09-01T16:54:42+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <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="author">
+    <names variable="author">
+      <name sort-separator=", " delimiter=", " and="symbol" initialize-with="." delimiter-precedes-last="never" name-as-sort-order="all"/>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="volume"/>
+      <else-if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </else-if>
+      <else-if variable="URL">
+        <text term="at"/>
+        <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issuance">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <group prefix=" " suffix=".">
+          <text variable="publisher" suffix=", "/>
+          <text variable="publisher-place" suffix=", "/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <text variable="number-of-pages" prefix=", " suffix=" p."/>
+        </group>
+      </if>
+      <else>
+        <date prefix=" (" suffix=")." variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout vertical-align="baseline" delimiter="," prefix="(" suffix=")">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="2" et-al-use-first="1" second-field-align="flush" entry-spacing="0">
+    <layout>
+      <text variable="citation-number" suffix="."/>
+      <text macro="author"/>
+      <text macro="issuance"/>
+      <text variable="container-title" font-style="normal" prefix=" " suffix=", " form="short"/>
+      <text variable="volume" suffix=", " font-weight="normal"/>
+      <text variable="page"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/jeb.csl b/jeb.csl
index 922ad933f1..354582ee2e 100644
--- a/jeb.csl
+++ b/jeb.csl
@@ -1,147 +1,148 @@
 <?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">
-   <info>
-      <title>Journal of Evolutionary Biology</title>
-      <id>http://www.zotero.org/styles/jeb</id>
-      <link href="http://www.zotero.org/styles/jeb" rel="self"/>
-      <author>
-         <name>Martin Lind</name>
-         <email>martin.lind@emg.umu.se</email>
-      </author>
-      <category citation-format="author-date"/>
-      <category field="biology"/>
-      <updated>2008-01-16T17:41:10+00:00</updated>
-   </info>
-   <macro name="editor-translator">
-      <names variable="editor translator" prefix="(" suffix=")" delimiter=", ">
-         <name and="symbol" 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" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
-         <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=". "/>
-         <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="access">
+  <info>
+    <title>Journal of Evolutionary Biology</title>
+    <id>http://www.zotero.org/styles/jeb</id>
+    <link href="http://www.zotero.org/styles/jeb" rel="self"/>
+    <author>
+      <name>Martin Lind</name>
+      <email>martin.lind@emg.umu.se</email>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="biology"/>
+    <updated>2008-01-16T17:41:10+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor-translator">
+    <names variable="editor translator" prefix="(" suffix=")" delimiter=", ">
+      <name and="symbol" 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" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
+      <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=". "/>
+      <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="access">
+    <group>
+      <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+      <date variable="accessed" suffix=", ">
+        <date-part name="month" suffix=" "/>
+        <date-part name="day" suffix=", "/>
+        <date-part name="year"/>
+      </date>
       <group>
-         <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-         <date variable="accessed" suffix=", ">
-            <date-part name="month" suffix=" "/>
-            <date-part name="day" suffix=", "/>
-            <date-part name="year"/>
-         </date>
-         <group>
-            <text term="from" suffix=" "/>
-            <text variable="URL"/>
-         </group>
+        <text term="from" suffix=" "/>
+        <text variable="URL"/>
       </group>
-   </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-place"/>
-         <text variable="publisher"/>
+    </group>
+  </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-place"/>
+      <text variable="publisher"/>
+    </group>
+  </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">
+    <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 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">
-      <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="15" et-al-use-first="15">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="title"/>
+    </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=". ">
+            <text term="in" text-case="capitalize-first"/>
+            <names variable="editor translator" prefix=" " suffix="," delimiter=", ">
+              <name and="symbol" sort-separator=", " initialize-with=". "/>
+              <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" 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=" "/>
+              <group prefix=" (" suffix=")">
+                <label variable="page" form="short" suffix=". " strip-periods="true"/>
+                <text variable="page"/>
+              </group>
             </group>
-         </group>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="15" et-al-use-first="15">
-      <sort>
-         <key macro="author-short"/>
-         <key macro="title"/>
-      </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=". ">
-                  <text term="in" text-case="capitalize-first"/>
-                  <names variable="editor translator" prefix=" " suffix="," delimiter=", ">
-                     <name and="symbol" sort-separator=", " initialize-with=". "/>
-                     <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" 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=" "/>
-                     <group prefix=" (" suffix=")">
-                        <label variable="page" form="short" suffix=". " strip-periods="true"/>
-                        <text variable="page"/>
-                     </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>
-         <text prefix=" " macro="access"/>
-      </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>
+      <text prefix=" " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/jghe.csl b/jghe.csl
index b955527175..82c39f38ce 100644
--- a/jghe.csl
+++ b/jghe.csl
@@ -1,324 +1,325 @@
 <?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">
-   <info>
-      <title>Journal of Geography in Higher Education</title>
-      <id>http://www.zotero.org/styles/jghe</id>
-      <link href="http://www.zotero.org/styles/jghe" rel="self"/>
-      <link href="http://forums.zotero.org/discussion/13948/style-request-journal-of-geography-in-higher-education/" rel="documentation"/>
-      <author>
-         <name>Andrei Israel</name>
-         <email>ali122@psu.edu</email>
-      </author>
-      <contributor>
-         <name>Simon Kornblith</name>
-         <email>simon@simonster.com</email>
-      </contributor>
-      <contributor>
-         <name>Bruce D'Arcus</name>
-      </contributor>
-      <contributor>
-         <name>Curtis M. Humphrey</name>
-      </contributor>
-      <contributor>
-         <name>Richard Karnesky</name>
-         <email>karnesky+zotero@gmail.com</email>
-         <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-      </contributor>
-      <contributor>
-         <name>Sebastian Karcher</name>
-      </contributor>
-      <category field="psychology"/>
-      <category citation-format="author-date"/>
-      <updated>2010-01-27T20:08:03+00:00</updated>
-   </info>
-   <macro name="container-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <text term="in" suffix=": "/>
-            <names variable="editor translator" delimiter=", " suffix=", ">
-               <name and="symbol" initialize-with=". " delimiter=", "/>
-               <label form="short" prefix=" (" text-case="capitalize-first" suffix=".)" strip-periods="true"/>
-            </names>
-         </if>
-      </choose>
-   </macro>
-   <macro name="secondary-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="none">
-            <names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
-               <name and="symbol" initialize-with=". " delimiter=", "/>
-               <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
-            </names>
-         </if>
-      </choose>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
-         <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=". "/>
-         <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="access">
-      <choose>
-         <if type="thesis">
-            <choose>
-               <if variable="archive" match="any">
-                  <group>
-                     <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                     <text term="from" suffix=" "/>
-                     <text variable="archive" suffix="."/>
-                     <text variable="archive_location" prefix=" (" suffix=")"/>
-                  </group>
-               </if>
-               <else>
-                  <group>
-                     <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                     <text term="from" suffix=" "/>
-                     <text variable="URL"/>
-                  </group>
-               </else>
-            </choose>
-         </if>
-         <else>
-            <choose>
-               <if variable="DOI"/>
-               <else>
-                  <choose>
-                     <if type="webpage">
-                        <group>
-                           <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                           <date variable="accessed" suffix=", ">
-                              <date-part name="month" suffix=" "/>
-                              <date-part name="day" suffix=", "/>
-                              <date-part name="year"/>
-                           </date>
-                           <group>
-                              <text term="from" suffix=" "/>
-                              <text variable="URL"/>
-                           </group>
-                        </group>
-                     </if>
-                     <else>
-                        <group>
-                           <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                           <text term="from" suffix=" "/>
-                           <text variable="URL"/>
-                        </group>
-                     </else>
-                  </choose>
-               </else>
-            </choose>
-         </else>
-      </choose>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if type="report thesis" match="any">
-            <text variable="title" font-style="italic"/>
-            <group prefix=" (" suffix=")">
-               <text variable="genre"/>
-               <text variable="number" prefix=" No. "/>
-            </group>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song manuscript speech" match="any">
-            <text variable="title" font-style="italic"/>
-         </else-if>
-         <else>
-            <text variable="title"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <choose>
-         <if type="report" match="any">
-            <group delimiter=": ">
-               <text variable="publisher-place"/>
-               <text variable="publisher"/>
+  <info>
+    <title>Journal of Geography in Higher Education</title>
+    <id>http://www.zotero.org/styles/jghe</id>
+    <link href="http://www.zotero.org/styles/jghe" rel="self"/>
+    <link href="http://forums.zotero.org/discussion/13948/style-request-journal-of-geography-in-higher-education/" rel="documentation"/>
+    <author>
+      <name>Andrei Israel</name>
+      <email>ali122@psu.edu</email>
+    </author>
+    <contributor>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email>
+    </contributor>
+    <contributor>
+      <name>Bruce D'Arcus</name>
+    </contributor>
+    <contributor>
+      <name>Curtis M. Humphrey</name>
+    </contributor>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <category field="psychology"/>
+    <category citation-format="author-date"/>
+    <updated>2010-01-27T20:08:03+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" suffix=": "/>
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" text-case="capitalize-first" suffix=".)" strip-periods="true"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
+          <name and="symbol" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=", " text-case="capitalize-first" suffix="." strip-periods="true"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
+      <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=". "/>
+      <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="access">
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if variable="archive" match="any">
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
             </group>
-         </if>
-         <else-if type="thesis" match="any">
-            <group delimiter=", ">
-               <text variable="publisher"/>
-               <text variable="publisher-place"/>
-            </group>
-         </else-if>
-         <else>
-            <choose>
-               <if variable="event" match="none">
-                  <text variable="genre" suffix=", "/>
-               </if>
-            </choose>
-            <group delimiter=": ">
-               <text variable="publisher-place"/>
-               <text variable="publisher"/>
+          </if>
+          <else>
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="URL"/>
             </group>
-         </else>
-      </choose>
-   </macro>
-   <macro name="event">
-      <choose>
-         <if variable="event">
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI"/>
+          <else>
             <choose>
-               <if variable="genre" match="none">
-                  <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                  <text variable="event"/>
-               </if>
-               <else>
-                  <group delimiter=" ">
-                     <text variable="genre" text-case="capitalize-first"/>
-                     <text term="presented at"/>
-                     <text variable="event"/>
+              <if type="webpage">
+                <group>
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <date variable="accessed" suffix=", ">
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="day" suffix=", "/>
+                    <date-part name="year"/>
+                  </date>
+                  <group>
+                    <text term="from" suffix=" "/>
+                    <text variable="URL"/>
                   </group>
-               </else>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <text term="from" suffix=" "/>
+                  <text variable="URL"/>
+                </group>
+              </else>
             </choose>
-         </if>
-      </choose>
-   </macro>
-   <macro name="issued">
-      <choose>
-         <if variable="issued">
-            <group prefix=" (" suffix=").">
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
-               <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>
-            <text prefix=" (" term="no date" suffix=")." form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="issued-year">
-      <choose>
-         <if variable="issued">
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else>
-            <text term="no date" form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="edition">
-      <choose>
-         <if is-numeric="edition">
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <text variable="title" font-style="italic"/>
+        <group prefix=" (" suffix=")">
+          <text variable="genre"/>
+          <text variable="number" prefix=" No. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song manuscript speech" match="any">
+        <text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="report" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else-if>
+      <else>
+        <choose>
+          <if variable="event" match="none">
+            <text variable="genre" suffix=", "/>
+          </if>
+        </choose>
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <choose>
+          <if variable="genre" match="none">
+            <text term="presented at" text-case="capitalize-first" suffix=" "/>
+            <text variable="event"/>
+          </if>
+          <else>
             <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
+              <text variable="genre" text-case="capitalize-first"/>
+              <text term="presented at"/>
+              <text variable="event"/>
             </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="locators">
-      <choose>
-         <if type="article-journal article-magazine article-newspaper" match="any">
-            <group prefix=", " delimiter=", ">
-               <group>
-                  <text variable="volume"/>
-                  <text variable="issue" prefix="(" suffix=")"/>
-               </group>
-               <text variable="page" prefix="pp. "/>
-            </group>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <group prefix=", " suffix="" delimiter=", ">
-               <text macro="edition"/>
-               <group>
-                  <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                  <number variable="number-of-volumes" form="numeric" prefix="1-"/>
-               </group>
-               <group>
-                  <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                  <number variable="volume" form="numeric"/>
-               </group>
-               <group>
-                  <label variable="page" form="short" suffix=" "/>
-                  <text variable="page"/>
-               </group>
-            </group>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="citation-locator">
-      <group>
-         <label variable="locator" form="short"/>
-         <text variable="locator" prefix=" "/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <group prefix=" (" suffix=").">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <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>
+        <text prefix=" (" term="no date" suffix=")." form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=", " delimiter=", ">
+          <group>
+            <text variable="volume"/>
+            <text variable="issue" prefix="(" suffix=")"/>
+          </group>
+          <text variable="page" prefix="pp. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <group prefix=", " suffix="" delimiter=", ">
+          <text macro="edition"/>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
+          </group>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <label variable="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </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">
+    <sort>
+      <key macro="issued-year"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
       </group>
-   </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">
-      <sort>
-         <key macro="issued-year"/>
-         <key macro="author"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <group delimiter=", ">
-            <text macro="author-short"/>
-            <text macro="issued-year"/>
-            <text macro="citation-locator"/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography entry-spacing="0" line-spacing="2">
-      <sort>
-         <key macro="author"/>
-         <key macro="issued-year" sort="ascending"/>
-      </sort>
-      <layout>
-         <group suffix=".">
-            <text macro="author" suffix="."/>
-            <text macro="issued" suffix=" "/>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year" sort="ascending"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <text macro="author" suffix="."/>
+        <text macro="issued" suffix=" "/>
+        <group delimiter=", ">
+          <text macro="title"/>
+          <group>
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
             <group delimiter=", ">
-               <text macro="title"/>
-               <group>
-                  <text macro="container-contributors"/>
-                  <text macro="secondary-contributors"/>
-                  <group delimiter=", ">
-                     <text variable="container-title" font-style="italic"/>
-                     <text variable="collection-title"/>
-                  </group>
-               </group>
+              <text variable="container-title" font-style="italic"/>
+              <text variable="collection-title"/>
             </group>
-            <text macro="locators"/>
-            <group delimiter=", " prefix=" ">
-               <text macro="event"/>
-               <text macro="publisher" prefix="(" suffix=")"/>
-            </group>
-         </group>
-         <text macro="access" prefix=". "/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+          </group>
+        </group>
+        <text macro="locators"/>
+        <group delimiter=", " prefix=" ">
+          <text macro="event"/>
+          <text macro="publisher" prefix="(" suffix=")"/>
+        </group>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/journal-of-experimental-biology.csl b/journal-of-experimental-biology.csl
index d28565ea2b..093099b0f1 100644
--- a/journal-of-experimental-biology.csl
+++ b/journal-of-experimental-biology.csl
@@ -1,6 +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="never" default-locale="en-US">
-
   <info>
     <title>Journal of Experimental Biology</title>
     <id>http://www.zotero.org/styles/journal-of-experimental-biology</id>
@@ -19,101 +18,91 @@
     <updated>2011-05-12T00:16:08+00:00</updated>
     <summary>Journal of Experimental Biology style.</summary>
     <link href="http://jeb.biologists.org/site/author/manuscript_preparation.xhtml#references" rel="documentation"/>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
-
   <macro name="editor">
     <names variable="editor" delimiter=",">
       <label form="short" plural="never" prefix="(" text-case="lowercase" suffix=" "/>
       <name name-as-sort-order="all" sort-separator=", " and="text" initialize-with=". " delimiter=", " suffix=")"/>
     </names>
   </macro>
-
   <macro name="author">
     <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"/>
-	<text variable="title"/>
+        <names variable="editor"/>
+        <text variable="title"/>
       </substitute>
     </names>
   </macro>
-
   <macro name="author-short">
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with=". "/>
       <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text variable="title"/>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
       </substitute>
     </names>
   </macro>
-
   <macro name="access">
     <choose>
       <if variable="URL">
-	<text value="Available at:" suffix=" "/>
-	<text variable="URL"/>
-	<group prefix=" [" suffix="]">
-	  <text term="accessed" text-case="capitalize-first" suffix=" "/>
-	  <date variable="accessed">
-	    <date-part name="month" suffix=" "/>
-	    <date-part name="day" suffix=", "/>
-	    <date-part name="year"/>
-	  </date>
-	</group>
+        <text value="Available at:" suffix=" "/>
+        <text variable="URL"/>
+        <group prefix=" [" suffix="]">
+          <text term="accessed" text-case="capitalize-first" suffix=" "/>
+          <date variable="accessed">
+            <date-part name="month" suffix=" "/>
+            <date-part name="day" suffix=", "/>
+            <date-part name="year"/>
+          </date>
+        </group>
       </if>
     </choose>
   </macro>
-
   <macro name="title">
     <text variable="title"/>
   </macro>
-
   <macro name="publisher">
     <group delimiter=": ">
       <text variable="publisher-place"/>
       <text variable="publisher"/>
     </group>
   </macro>
-
   <macro name="year-date">
     <date variable="issued">
       <date-part name="year"/>
     </date>
   </macro>
-
   <macro name="edition">
     <choose>
       <if is-numeric="edition">
-	<group delimiter=" ">
-	  <number variable="edition" form="ordinal"/>
-	  <text term="edition" form="short" suffix="." strip-periods="true"/>
-	</group>
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
       </if>
       <else>
-	<text variable="edition" suffix="."/>
+        <text variable="edition" suffix="."/>
       </else>
     </choose>
   </macro>
-
   <macro name="authorcount">
     <names variable="author">
       <name form="count"/>
     </names>
   </macro>
-
   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true">
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-	<text macro="author-short"/>
-	<text macro="year-date"/>
-	<text variable="locator"/>
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <text variable="locator"/>
       </group>
     </layout>
   </citation>
-
   <bibliography hanging-indent="true" et-al-min="11" et-al-use-first="10">
     <sort>
       <key macro="author-short" names-min="1" names-use-first="1"/>
@@ -124,40 +113,39 @@
     <layout suffix=".">
       <text macro="author" font-weight="bold"/>
       <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 delimiter=" " prefix=" ">
-	    <text macro="title" font-style="italic" suffix="." />
-	    <text macro="edition"/>
-	    <text macro="editor"/>
-	    <text macro="publisher"/>
-	  </group>
-	</if>
-	<else-if type="chapter paper-conference" match="any">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " suffix=", " delimiter=" ">
-	    <text term="in" text-case="capitalize-first"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <text macro="editor"/>
-	  </group>
-	  <group delimiter=" ">
-	    <label variable="page" form="short" />
-	    <text variable="page" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" form="short" font-style="italic" />
-	    <text variable="volume" font-weight="bold" suffix=","/>
-	    <text variable="page"/>
-	  </group>
-	</else>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter=" " prefix=" ">
+            <text macro="title" font-style="italic" suffix="."/>
+            <text macro="edition"/>
+            <text macro="editor"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" prefix=" " suffix="."/>
+          <group prefix=" " suffix=", " delimiter=" ">
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title" font-style="italic"/>
+            <text macro="editor"/>
+          </group>
+          <group delimiter=" ">
+            <label variable="page" form="short"/>
+            <text variable="page" suffix="."/>
+            <text macro="publisher"/>
+          </group>
+        </else-if>
+        <else>
+          <text macro="title" prefix=" " suffix="."/>
+          <group prefix=" " suffix="." delimiter=" ">
+            <text variable="container-title" form="short" font-style="italic"/>
+            <text variable="volume" font-weight="bold" suffix=","/>
+            <text variable="page"/>
+          </group>
+        </else>
       </choose>
     </layout>
   </bibliography>
-
-</style>
\ No newline at end of file
+</style>
diff --git a/limnology-and-oceanography.csl b/limnology-and-oceanography.csl
index 939b768f60..381a25a039 100644
--- a/limnology-and-oceanography.csl
+++ b/limnology-and-oceanography.csl
@@ -1,210 +1,211 @@
 <?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">
-   <info>
-      <title>Limnology and Oceanography</title>
-      <id>http://www.zotero.org/styles/limnology-and-oceanography</id>
-      <link href="http://www.zotero.org/styles/limnology-and-oceanography" rel="self"/>
-      <link href="http://www.aslo.org/lo/instructions/authors.html#References" rel="documentation"/>
-      <author>
-         <name>Sebastian Karcher</name>
-      </author>
-      <contributor>
-         <name>Carl J. Schreck, III</name>
-         <email>carl.schreck@gmail.com</email>
-      </contributor>
-      <category field="geology"/>
-      <category citation-format="author-date"/>
-      <updated>2010-05-20T16:03:51+00:00</updated>
-   </info>
-   <macro name="editor">
-      <names variable="editor">
-         <name and="text" delimiter=", " initialize-with=".">
-            <name-part name="family" text-case="capitalize-first"/>
-            <name-part name="given" text-case="capitalize-first"/>
-         </name>
-         <label form="short" text-case="lowercase" prefix=" [" suffix=".]" strip-periods="true"/>
-      </names>
-   </macro>
-   <macro name="series-editor">
-      <names variable="original-author">
-         <label form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize-with=". "/>
-         <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="author-short">
-      <names variable="author">
-         <name form="short" and="text" delimiter=", "/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="access">
-      <choose>
-         <if variable="DOI">
-            <text variable="DOI" prefix=", doi:"/>
-         </if>
-      </choose>
-   </macro>
-   <macro name="title">
-      <text variable="title"/>
-   </macro>
-   <macro name="publisher">
-      <text variable="publisher"/>
-   </macro>
-   <macro name="year-date">
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="day-month">
-      <date variable="issued">
-         <date-part name="month"/>
-         <date-part name="day" prefix=" "/>
-      </date>
-   </macro>
-   <macro name="page">
-      <text variable="page" prefix="p. "/>
-   </macro>
-   <macro name="edition">
-      <choose>
-         <if is-numeric="edition">
+  <info>
+    <title>Limnology and Oceanography</title>
+    <id>http://www.zotero.org/styles/limnology-and-oceanography</id>
+    <link href="http://www.zotero.org/styles/limnology-and-oceanography" rel="self"/>
+    <link href="http://www.aslo.org/lo/instructions/authors.html#References" rel="documentation"/>
+    <author>
+      <name>Sebastian Karcher</name>
+    </author>
+    <contributor>
+      <name>Carl J. Schreck, III</name>
+      <email>carl.schreck@gmail.com</email>
+    </contributor>
+    <category field="geology"/>
+    <category citation-format="author-date"/>
+    <updated>2010-05-20T16:03:51+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="text" delimiter=", " initialize-with=".">
+        <name-part name="family" text-case="capitalize-first"/>
+        <name-part name="given" text-case="capitalize-first"/>
+      </name>
+      <label form="short" text-case="lowercase" prefix=" [" suffix=".]" strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize-with=". "/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix=", doi:"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="page">
+    <text variable="page" prefix="p. "/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </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" collapse="year-suffix">
+    <sort>
+      <key variable="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="author-short"/>
+          <text macro="year-date"/>
+        </group>
+        <text variable="locator" prefix="p. "/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="0" line-spacing="2" hanging-indent="true" et-al-min="1000" et-al-use-first="1">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout>
+      <group>
+        <group delimiter=" ">
+          <text macro="author" suffix="."/>
+          <text macro="year-date" suffix="."/>
+        </group>
+        <choose>
+          <if type="article-newspaper article-magazine" match="any">
             <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
+              <text macro="title" prefix=" " suffix="."/>
             </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
-      </choose>
-   </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" collapse="year-suffix">
-      <sort>
-         <key variable="issued"/>
-         <key macro="author"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <group delimiter=", ">
-            <group delimiter=" ">
-               <text macro="author-short"/>
-               <text macro="year-date"/>
+            <group prefix=" " delimiter=", ">
+              <text variable="container-title" form="short"/>
+              <text macro="day-month"/>
+              <text variable="edition"/>
+            </group>
+          </if>
+          <else-if type="thesis">
+            <group prefix=" " delimiter=". " suffix=".">
+              <text macro="title"/>
+              <text variable="genre"/>
+              <text variable="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+            <group delimiter=" " suffix=".">
+              <text macro="title" prefix=" " suffix=","/>
+              <text macro="edition"/>
+              <text macro="editor" suffix="."/>
+              <text macro="publisher"/>
             </group>
-            <text variable="locator" prefix="p. "/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography entry-spacing="0" line-spacing="2" hanging-indent="true" et-al-min="1000" et-al-use-first="1">
-      <sort>
-         <key macro="author"/>
-         <key variable="issued"/>
-      </sort>
-      <layout>
-         <group>
+          </else-if>
+          <else-if type="paper-conference">
             <group delimiter=" ">
-               <text macro="author" suffix="."/>
-               <text macro="year-date" suffix="."/>
+              <text macro="title" prefix=" " suffix="."/>
+              <group delimiter=", ">
+                <group delimiter=", ">
+                  <text variable="container-title" font-style="italic"/>
+                  <text macro="editor" prefix="" suffix=""/>
+                </group>
+                <group delimiter=" ">
+                  <text variable="volume" prefix="Vol. " suffix=" of"/>
+                  <text variable="collection-title" font-style="italic"/>
+                  <text macro="series-editor"/>
+                </group>
+                <text variable="event" prefix=""/>
+                <text variable="publisher-place" prefix=""/>
+                <text variable="publisher" prefix=""/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=" " suffix=".">
+              <text macro="title" prefix=" " suffix=","/>
+              <text macro="page" suffix="."/>
+              <text term="in" text-case="capitalize-first" font-style="italic"/>
+              <group delimiter=". ">
+                <group delimiter=", ">
+                  <text macro="editor" prefix="" suffix=""/>
+                  <text variable="container-title"/>
+                </group>
+                <text macro="publisher"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group suffix=".">
+              <text macro="title" prefix=" "/>
+              <text macro="editor" prefix=" "/>
             </group>
             <choose>
-               <if type="article-newspaper article-magazine" match="any">
-                  <group delimiter=" ">
-                     <text macro="title" prefix=" " suffix="."/>
-                  </group>
-                  <group prefix=" " delimiter=", ">
-                     <text variable="container-title" form="short"/>
-                     <text macro="day-month"/>
-                     <text variable="edition"/>
-                  </group>
-               </if>
-               <else-if type="thesis">
-                  <group prefix=" " delimiter=". " suffix=".">
-                     <text macro="title"/>
-                     <text variable="genre"/>
-                     <text variable="publisher"/>
-                  </group>
-               </else-if>
-               <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-                  <group delimiter=" " suffix=".">
-                     <text macro="title" prefix=" " suffix=","/>
-                     <text macro="edition"/>
-                     <text macro="editor" suffix="."/>
-                     <text macro="publisher"/>
-                  </group>
-               </else-if>
-               <else-if type="paper-conference">
-                  <group delimiter=" ">
-                     <text macro="title" prefix=" " suffix="."/>
-                     <group delimiter=", ">
-                        <group delimiter=", ">
-                           <text variable="container-title" font-style="italic"/>
-                           <text macro="editor" prefix="" suffix=""/>
-                        </group>
-                        <group delimiter=" ">
-                           <text variable="volume" prefix="Vol. " suffix=" of"/>
-                           <text variable="collection-title" font-style="italic"/>
-                           <text macro="series-editor"/>
-                        </group>
-                        <text variable="event" prefix=""/>
-                        <text variable="publisher-place" prefix=""/>
-                        <text variable="publisher" prefix=""/>
-                        <text variable="page"/>
-                     </group>
-                  </group>
-               </else-if>
-               <else-if type="chapter paper-conference" match="any">
-                  <group delimiter=" " suffix=".">
-                     <text macro="title" prefix=" " suffix=","/>
-                     <text macro="page" suffix="."/>
-                     <text term="in" text-case="capitalize-first" font-style="italic"/>
-                     <group delimiter=". ">
-                        <group delimiter=", ">
-                           <text macro="editor" prefix="" suffix=""/>
-                           <text variable="container-title"/>
-                        </group>
-                        <text macro="publisher"/>
-                     </group>
+              <if variable="DOI" match="none">
+                <group prefix=" " suffix="." delimiter=" ">
+                  <text variable="container-title" form="short" suffix=""/>
+                  <group delimiter=": " font-weight="normal">
+                    <text variable="volume" font-weight="bold"/>
+                    <text variable="page" font-weight="normal"/>
                   </group>
-               </else-if>
-               <else>
-                  <group suffix=".">
-                     <text macro="title" prefix=" "/>
-                     <text macro="editor" prefix=" "/>
+                </group>
+              </if>
+              <else>
+                <group prefix=" " suffix="" delimiter=" ">
+                  <text variable="container-title" form="short" suffix=""/>
+                  <group delimiter=": " font-weight="normal">
+                    <text variable="volume" font-weight="bold"/>
+                    <text variable="page" font-weight="normal"/>
                   </group>
-                  <choose>
-                     <if variable="DOI" match="none">
-                        <group prefix=" " suffix="." delimiter=" ">
-                           <text variable="container-title" form="short" suffix=""/>
-                           <group delimiter=": " font-weight="normal">
-                              <text variable="volume" font-weight="bold"/>
-                              <text variable="page" font-weight="normal"/>
-                           </group>
-                        </group>
-                     </if>
-                     <else>
-                        <group prefix=" " suffix="" delimiter=" ">
-                           <text variable="container-title" form="short" suffix=""/>
-                           <group delimiter=": " font-weight="normal">
-                              <text variable="volume" font-weight="bold"/>
-                              <text variable="page" font-weight="normal"/>
-                           </group>
-                        </group>
-                     </else>
-                  </choose>
-               </else>
+                </group>
+              </else>
             </choose>
-         </group>
-         <text  macro="access"/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+          </else>
+        </choose>
+      </group>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/mcgill-legal.csl b/mcgill-legal.csl
index 8ed70e816c..f575306d8b 100644
--- a/mcgill-legal.csl
+++ b/mcgill-legal.csl
@@ -1,130 +1,131 @@
 <?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">
-   <info>
-      <title>Canadian Legal - McGill</title>
-      <id>http://www.zotero.org/styles/mcgill-legal</id>
-      <link href="http://www.zotero.org/styles/mcgill-legal" rel="self"/>
-      <link href="http://library.law.uvic.ca/research-help/research-tools" rel="documentation"/>
-      <author>
-         <name>Originally made with Simple style generator</name>
-         <email>mlines@uvic.ca</email>
-      </author>
-      <contributor>
-         <name>Richard Karnesky</name>
-         <email>karnesky+zotero@gmail.com</email>
-         <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-      </contributor>
-      <category field="social_science"/>
-      <category citation-format="numeric"/>
-      <updated>2008-07-25T10:04:29-07:00</updated>
-   </info>
-   <macro name="citation-number">
+  <info>
+    <title>Canadian Legal - McGill</title>
+    <id>http://www.zotero.org/styles/mcgill-legal</id>
+    <link href="http://www.zotero.org/styles/mcgill-legal" rel="self"/>
+    <link href="http://library.law.uvic.ca/research-help/research-tools" rel="documentation"/>
+    <author>
+      <name>Originally made with Simple style generator</name>
+      <email>mlines@uvic.ca</email>
+    </author>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <category field="social_science"/>
+    <category citation-format="numeric"/>
+    <updated>2008-07-25T10:04:29-07:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="citation-number">
+    <text variable="citation-number"/>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="article-journal">
+        <text variable="title"/>
+      </if>
+      <else>
+        <text variable="title" form="long"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
+  <macro name="publisher-place">
+    <text variable="publisher-place"/>
+  </macro>
+  <macro name="issue">
+    <text variable="issue"/>
+  </macro>
+  <macro name="URL">
+    <text variable="URL"/>
+  </macro>
+  <macro name="DOI">
+    <text variable="DOI"/>
+  </macro>
+  <macro name="edition">
+    <text variable="edition"/>
+  </macro>
+  <macro name="collection-title">
+    <text variable="collection-title"/>
+  </macro>
+  <macro name="volume">
+    <text variable="volume"/>
+  </macro>
+  <macro name="page">
+    <text variable="page"/>
+  </macro>
+  <macro name="container-title">
+    <text variable="container-title"/>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if type="article-journal">
+        <names variable="author">
+          <name/>
+        </names>
+      </if>
+      <else>
+        <names variable="author">
+          <name form="long" and="text">
+            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="given" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year" form="long"/>
+    </date>
+  </macro>
+  <macro name="author-citation">
+    <names variable="author">
+      <name form="short"/>
+    </names>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=";">
       <text variable="citation-number"/>
-   </macro>
-   <macro name="title">
+    </layout>
+  </citation>
+  <bibliography et-al-min="4" et-al-use-first="1">
+    <layout>
       <choose>
-         <if type="article-journal">
-            <text variable="title"/>
-         </if>
-         <else>
-            <text variable="title" form="long"/>
-         </else>
+        <if type="article-journal">
+          <text macro="author-short" suffix="."/>
+          <text macro="title" prefix="&quot;" suffix="&quot;"/>
+          <text macro="year-date" prefix="(" suffix=")"/>
+          <text macro="volume"/>
+          <text macro="container-title"/>
+          <text macro="page"/>
+        </if>
+        <else>
+          <text macro="author-short" suffix="."/>
+          <text macro="title"/>
+          <text macro="publisher-place" suffix=":"/>
+          <text macro="publisher" suffix=","/>
+          <text macro="year-date" suffix=")"/>
+        </else>
       </choose>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name/>
-      </names>
-   </macro>
-   <macro name="translator">
-      <names variable="translator">
-         <name/>
-      </names>
-   </macro>
-   <macro name="publisher">
-      <text variable="publisher"/>
-   </macro>
-   <macro name="publisher-place">
-      <text variable="publisher-place"/>
-   </macro>
-   <macro name="issue">
-      <text variable="issue"/>
-   </macro>
-   <macro name="URL">
-      <text variable="URL"/>
-   </macro>
-   <macro name="DOI">
-      <text variable="DOI"/>
-   </macro>
-   <macro name="edition">
-      <text variable="edition"/>
-   </macro>
-   <macro name="collection-title">
-      <text variable="collection-title"/>
-   </macro>
-   <macro name="volume">
-      <text variable="volume"/>
-   </macro>
-   <macro name="page">
-      <text variable="page"/>
-   </macro>
-   <macro name="container-title">
-      <text variable="container-title"/>
-   </macro>
-   <macro name="author-short">
-      <choose>
-         <if type="article-journal">
-            <names variable="author">
-               <name/>
-            </names>
-         </if>
-         <else>
-            <names variable="author">
-               <name form="long" and="text">
-                  <name-part name="family" text-case="capitalize-first"/>
-                  <name-part name="given" text-case="capitalize-first"/>
-               </name>
-            </names>
-         </else>
-      </choose>
-   </macro>
-   <macro name="year-date">
-      <date variable="issued">
-         <date-part name="year" form="long"/>
-      </date>
-   </macro>
-   <macro name="author-citation">
-      <names variable="author">
-         <name form="short"/>
-      </names>
-   </macro>
-   <citation collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter=";">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography et-al-min="4" et-al-use-first="1">
-      <layout>
-         <choose>
-            <if type="article-journal">
-               <text macro="author-short" suffix="."/>
-               <text macro="title" prefix="&#34;" suffix="&#34;"/>
-               <text macro="year-date" prefix="(" suffix=")"/>
-               <text macro="volume"/>
-               <text macro="container-title"/>
-               <text macro="page"/>
-            </if>
-            <else>
-               <text macro="author-short" suffix="."/>
-               <text macro="title"/>
-               <text macro="publisher-place" suffix=":"/>
-               <text macro="publisher" suffix=","/>
-               <text macro="year-date" suffix=")"/>
-            </else>
-         </choose>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </layout>
+  </bibliography>
+</style>
diff --git a/methods-information-medicine.csl b/methods-information-medicine.csl
index dce48fd5ff..c814c4826a 100644
--- a/methods-information-medicine.csl
+++ b/methods-information-medicine.csl
@@ -15,6 +15,7 @@
     <category field="medicine"/>
     <category citation-format="numeric"/>
     <updated>2009-09-13T01:57:47+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <locale xml:lang="en">
     <terms>
diff --git a/misq.csl b/misq.csl
index 8001ccfeab..bedee92f37 100644
--- a/misq.csl
+++ b/misq.csl
@@ -1,324 +1,325 @@
 <?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">
-   <info>
-      <title>MIS Quarterly</title>
-      <id>http://www.zotero.org/styles/misq</id>
-      <link href="http://www.zotero.org/styles/misq" rel="self"/>
-      <link href="http://www.misq.org/roadmap/standards.html" rel="documentation"/>
-      <link href="http://www.zotero.org/styles/apa" rel="template"/>
-      <author>
-         <name>Mikko Rönkkö</name>
-         <email>mikko.ronkko@tkk.fi</email>
-      </author>
-      <author>
-         <name>Simon Kornblith</name>
-         <email>simon@simonster.com</email>
-      </author>
-      <contributor>
-         <name>Bruce D'Arcus</name>
-      </contributor>
-      <contributor>
-         <name>Curtis M. Humphrey</name>
-      </contributor>
-      <contributor>
-         <name>Richard Karnesky</name>
-         <email>karnesky+zotero@gmail.com</email>
-         <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-      </contributor>
-      <contributor>
-         <name>Sebastian Karcher</name>
-      </contributor>
-      <contributor>
-         <name>James Howison</name>
-         <email>james@howison.name</email>
-         <uri>http://james.howison.name</uri>
-      </contributor>
-      <category citation-format="author-date"/>
-      <updated>2008-09-20T09:22:05+00:00</updated>
-   </info>
-   <macro name="container-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <names variable="editor translator" delimiter=", " suffix=", ">
-               <name and="text" initialize-with=". " delimiter=", "/>
-               <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
-            </names>
-         </if>
-      </choose>
-   </macro>
-   <macro name="secondary-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="none">
-            <names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
-               <name and="text" initialize-with=". " delimiter=", "/>
-               <label form="short" prefix=", " suffix="." strip-periods="true"/>
-            </names>
-         </if>
-      </choose>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-         <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
-         <substitute>
-            <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=". "/>
-         <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="access">
-      <choose>
-         <if type="thesis">
-            <choose>
-               <if variable="archive" match="any">
-                  <group>
-                     <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                     <text term="from" suffix=" "/>
-                     <text variable="archive" suffix="."/>
-                     <text variable="archive_location" prefix=" (" suffix=")"/>
-                  </group>
-               </if>
-               <else>
-                  <group>
-                     <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                     <text term="from" suffix=" "/>
-                     <text variable="URL"/>
-                  </group>
-               </else>
-            </choose>
-         </if>
-         <else>
-            <choose>
-               <if variable="DOI">
-                  <text variable="DOI" prefix="doi:"/>
-               </if>
-               <else>
-                  <choose>
-                     <if type="webpage">
-                        <group>
-                           <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                           <date variable="accessed" suffix=", ">
-                              <date-part name="month" suffix=" "/>
-                              <date-part name="day" suffix=", "/>
-                              <date-part name="year"/>
-                           </date>
-                           <group>
-                              <text term="from" suffix=" "/>
-                              <text variable="URL"/>
-                           </group>
-                        </group>
-                     </if>
-                     <else>
-                        <group>
-                           <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-                           <text term="from" suffix=" "/>
-                           <text variable="URL"/>
-                        </group>
-                     </else>
-                  </choose>
-               </else>
-            </choose>
-         </else>
-      </choose>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if type="report thesis" match="any">
-            <text variable="title" font-style="italic"/>
-            <group prefix=" (" suffix="), ">
-               <text variable="genre"/>
-               <text variable="number" prefix=" No. "/>
-            </group>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song manuscript speech" match="any">
-            <text variable="title" font-style="italic" suffix=", "/>
-         </else-if>
-         <else>
-            <text variable="title" quotes="true" suffix=","/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <choose>
-         <if type="report thesis" match="any">
-            <group delimiter=": ">
-               <text variable="publisher-place"/>
-               <text variable="publisher"/>
+  <info>
+    <title>MIS Quarterly</title>
+    <id>http://www.zotero.org/styles/misq</id>
+    <link href="http://www.zotero.org/styles/misq" rel="self"/>
+    <link href="http://www.misq.org/roadmap/standards.html" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/apa" rel="template"/>
+    <author>
+      <name>Mikko Rönkkö</name>
+      <email>mikko.ronkko@tkk.fi</email>
+    </author>
+    <author>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email>
+    </author>
+    <contributor>
+      <name>Bruce D'Arcus</name>
+    </contributor>
+    <contributor>
+      <name>Curtis M. Humphrey</name>
+    </contributor>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+    </contributor>
+    <contributor>
+      <name>James Howison</name>
+      <email>james@howison.name</email>
+      <uri>http://james.howison.name</uri>
+    </contributor>
+    <category citation-format="author-date"/>
+    <updated>2008-09-20T09:22:05+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name and="text" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=", " prefix=" (" suffix=")">
+          <name and="text" initialize-with=". " delimiter=", "/>
+          <label form="short" prefix=", " suffix="." strip-periods="true"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=".)" text-case="capitalize-first" strip-periods="true"/>
+      <substitute>
+        <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=". "/>
+      <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="access">
+    <choose>
+      <if type="thesis">
+        <choose>
+          <if variable="archive" match="any">
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="archive" suffix="."/>
+              <text variable="archive_location" prefix=" (" suffix=")"/>
             </group>
-         </if>
-         <else>
-            <choose>
-               <if variable="event" match="none">
-                  <text variable="genre" suffix=", "/>
-               </if>
-            </choose>
-            <group delimiter=": ">
-               <text variable="publisher-place"/>
-               <text variable="publisher"/>
+          </if>
+          <else>
+            <group>
+              <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+              <text term="from" suffix=" "/>
+              <text variable="URL"/>
             </group>
-         </else>
-      </choose>
-   </macro>
-   <macro name="event">
-      <choose>
-         <if variable="event">
+          </else>
+        </choose>
+      </if>
+      <else>
+        <choose>
+          <if variable="DOI">
+            <text variable="DOI" prefix="doi:"/>
+          </if>
+          <else>
             <choose>
-               <if variable="genre" match="none">
-                  <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                  <text variable="event"/>
-               </if>
-               <else>
-                  <group delimiter=" ">
-                     <text variable="genre" text-case="capitalize-first"/>
-                     <text term="presented at"/>
-                     <text variable="event"/>
+              <if type="webpage">
+                <group>
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <date variable="accessed" suffix=", ">
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="day" suffix=", "/>
+                    <date-part name="year"/>
+                  </date>
+                  <group>
+                    <text term="from" suffix=" "/>
+                    <text variable="URL"/>
                   </group>
-               </else>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+                  <text term="from" suffix=" "/>
+                  <text variable="URL"/>
+                </group>
+              </else>
             </choose>
-         </if>
-      </choose>
-   </macro>
-   <macro name="issued">
-      <choose>
-         <if variable="issued">
-            <group prefix=" " suffix=".">
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
-               <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>
-            <text prefix=" (" term="no date" suffix=")." form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="issued-year">
-      <choose>
-         <if variable="issued">
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else>
-            <text term="no date" form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="edition">
-      <choose>
-         <if is-numeric="edition">
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="report thesis" match="any">
+        <text variable="title" font-style="italic"/>
+        <group prefix=" (" suffix="), ">
+          <text variable="genre"/>
+          <text variable="number" prefix=" No. "/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song manuscript speech" match="any">
+        <text variable="title" font-style="italic" suffix=", "/>
+      </else-if>
+      <else>
+        <text variable="title" quotes="true" suffix=","/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="report thesis" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else>
+        <choose>
+          <if variable="event" match="none">
+            <text variable="genre" suffix=", "/>
+          </if>
+        </choose>
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <choose>
+          <if variable="genre" match="none">
+            <text term="presented at" text-case="capitalize-first" suffix=" "/>
+            <text variable="event"/>
+          </if>
+          <else>
             <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix=", " strip-periods="true"/>
-            </group>
-         </if>
-         <else>
-            <text variable="edition" suffix=", "/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="locators">
-      <choose>
-         <if type="article-journal article-magazine article-newspaper" match="any">
-            <group prefix=" " delimiter=", ">
-               <group prefix="(" suffix=")" delimiter=":">
-                  <text variable="volume"/>
-                  <text variable="issue"/>
-               </group>
-            </group>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <group prefix=" (" suffix=")" delimiter=", ">
-               <text macro="edition"/>
-               <group>
-                  <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                  <number variable="number-of-volumes" form="numeric" prefix="1-"/>
-               </group>
-               <group>
-                  <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                  <number variable="volume" form="numeric"/>
-               </group>
+              <text variable="genre" text-case="capitalize-first"/>
+              <text term="presented at"/>
+              <text variable="event"/>
             </group>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="citation-locator">
-      <group>
-         <label variable="locator" form="short"/>
-         <text variable="locator" prefix=" "/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if variable="issued">
+        <group prefix=" " suffix=".">
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+          <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>
+        <text prefix=" (" term="no date" suffix=")." form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix=", " strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=" " delimiter=", ">
+          <group prefix="(" suffix=")" delimiter=":">
+            <text variable="volume"/>
+            <text variable="issue"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <text macro="edition"/>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <number variable="number-of-volumes" form="numeric" prefix="1-"/>
+          </group>
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <number variable="volume" form="numeric"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="by-cite" collapse="year">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="citation-locator"/>
       </group>
-   </macro>
-   <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="by-cite" collapse="year">
-      <sort>
-         <key macro="author"/>
-         <key macro="issued-year"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <group delimiter=" ">
-            <text macro="author-short"/>
-            <text macro="issued-year"/>
-            <text macro="citation-locator"/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography entry-spacing="1" line-spacing="1" hanging-indent="true">
-      <sort>
-         <key macro="author"/>
-         <key macro="issued-year" sort="ascending"/>
-      </sort>
-      <layout>
-         <group suffix=".">
-            <text macro="author" suffix="."/>
-            <text macro="issued" suffix=" "/>
-            <group delimiter=" ">
-               <text macro="title"/>
-               <group delimiter=", ">
-                  <group>
-                     <choose>
-                        <if type="chapter paper-conference" match="any">
-                           <text term="in" text-case="capitalize-first" suffix=" "/>
-                        </if>
-                     </choose>
-                     <text variable="container-title" font-style="italic"/>
-                     <text variable="collection-title"/>
-                  </group>
-                  <text macro="container-contributors"/>
-                  <text macro="secondary-contributors"/>
-               </group>
+    </layout>
+  </citation>
+  <bibliography entry-spacing="1" line-spacing="1" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key macro="issued-year" sort="ascending"/>
+    </sort>
+    <layout>
+      <group suffix=".">
+        <text macro="author" suffix="."/>
+        <text macro="issued" suffix=" "/>
+        <group delimiter=" ">
+          <text macro="title"/>
+          <group delimiter=", ">
+            <group>
+              <choose>
+                <if type="chapter paper-conference" match="any">
+                  <text term="in" text-case="capitalize-first" suffix=" "/>
+                </if>
+              </choose>
+              <text variable="container-title" font-style="italic"/>
+              <text variable="collection-title"/>
             </group>
-            <text macro="locators"/>
-            <group delimiter=", ">
-               <text macro="event"/>
-               <text macro="publisher"/>
-            </group>
-            <text prefix=", pp. " variable="page"/>
-         </group>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+          </group>
+        </group>
+        <text macro="locators"/>
+        <group delimiter=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+        <text prefix=", pp. " variable="page"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/molecular-biochemical-parasitology.csl b/molecular-biochemical-parasitology.csl
index 6a2b54ba2b..9c3c2e5d56 100644
--- a/molecular-biochemical-parasitology.csl
+++ b/molecular-biochemical-parasitology.csl
@@ -1,154 +1,155 @@
 <?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">
-   <info>
-      <title>Molecular and Biochemical Parasitology</title>
-      <id>http://www.zotero.org/styles/molecular-biochemical-parasitology</id>
-      <link href="http://www.zotero.org/styles/molecular-biochemical-parasitology" rel="self"/>
-      <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/506086/authorinstructions" rel="documentation"/>
-      <author>
-         <name>Yevgeniy Medynskiy</name>
-         <email>eugenem@gatech.edu</email>
-      </author>
-      <contributor>
-         <name>Eric Baumer</name>
-         <email>ebaumer@ics.uci.edu</email>
-      </contributor>
-      <contributor>
-         <name>Svetlana Yarosh</name>
-         <email>lana@cc.gatech.edu</email>
-      </contributor>
-      <contributor>
-         <name>Lilly Irani</name>
-         <email>lirani@ics.uci.edu</email>
-      </contributor>
-      <contributor>
-         <name>Sebastian Karcher</name>
-         <email>karcher@u.northwestern.edu</email>
-      </contributor>
-      <category field="medicine"/>
-      <category citation-format="numeric"/>
-      <updated>2009-08-15T01:57:47+00:00</updated>
-   </info>
-   <macro name="author">
-      <group suffix=".">
-         <names variable="author">
-            <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
-            <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
-            <substitute>
-               <names variable="editor"/>
-            </substitute>
-         </names>
-      </group>
-   </macro>
-   <macro name="editor">
-      <names variable="editor">
-         <name name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always" initialize-with="" delimiter=", "/>
-         <label form="long" prefix=", " text-case="lowercase" suffix="."/>
+  <info>
+    <title>Molecular and Biochemical Parasitology</title>
+    <id>http://www.zotero.org/styles/molecular-biochemical-parasitology</id>
+    <link href="http://www.zotero.org/styles/molecular-biochemical-parasitology" rel="self"/>
+    <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/506086/authorinstructions" rel="documentation"/>
+    <author>
+      <name>Yevgeniy Medynskiy</name>
+      <email>eugenem@gatech.edu</email>
+    </author>
+    <contributor>
+      <name>Eric Baumer</name>
+      <email>ebaumer@ics.uci.edu</email>
+    </contributor>
+    <contributor>
+      <name>Svetlana Yarosh</name>
+      <email>lana@cc.gatech.edu</email>
+    </contributor>
+    <contributor>
+      <name>Lilly Irani</name>
+      <email>lirani@ics.uci.edu</email>
+    </contributor>
+    <contributor>
+      <name>Sebastian Karcher</name>
+      <email>karcher@u.northwestern.edu</email>
+    </contributor>
+    <category field="medicine"/>
+    <category citation-format="numeric"/>
+    <updated>2009-08-15T01:57:47+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+        <name initialize-with="" delimiter=", " delimiter-precedes-last="always" name-as-sort-order="all" sort-separator=" "/>
+        <label form="short" prefix=", " suffix="." text-case="lowercase" strip-periods="true"/>
+        <substitute>
+          <names variable="editor"/>
+        </substitute>
       </names>
-   </macro>
-   <macro name="title">
-      <text variable="title" quotes="false"/>
-   </macro>
-   <macro name="year">
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="journal">
-      <group suffix="" delimiter=" ">
-         <text variable="container-title" form="short"/>
-         <text macro="year" prefix="" suffix=";"/>
-         <text variable="volume"/>
-      </group>
-   </macro>
-   <macro name="conference">
-      <group delimiter=", ">
-         <text variable="container-title"/>
-         <group delimiter=" ">
-            <text variable="publisher"/>
-            <text macro="year" prefix="" suffix=""/>
-         </group>
+    </group>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " delimiter-precedes-last="always" initialize-with="" delimiter=", "/>
+      <label form="long" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="title">
+    <text variable="title" quotes="false"/>
+  </macro>
+  <macro name="year">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="journal">
+    <group suffix="" delimiter=" ">
+      <text variable="container-title" form="short"/>
+      <text macro="year" prefix="" suffix=";"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="conference">
+    <group delimiter=", ">
+      <text variable="container-title"/>
+      <group delimiter=" ">
+        <text variable="publisher"/>
+        <text macro="year" prefix="" suffix=""/>
       </group>
-   </macro>
-   <macro name="book-publisher">
-      <group delimiter=", ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
-         <text macro="year"/>
+    </group>
+  </macro>
+  <macro name="book-publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+      <text macro="year"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <citation>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <group delimiter=":">
+        <text variable="citation-number"/>
+        <text variable="locator"/>
       </group>
-   </macro>
-   <macro name="edition">
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author" suffix=". "/>
+      <text macro="title" suffix=". "/>
       <choose>
-         <if is-numeric="edition">
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <text macro="edition" suffix=" "/>
+          <text macro="book-publisher" suffix="."/>
+        </if>
+        <else-if type="paper-conference">
+          <group suffix="." delimiter=", ">
+            <text macro="conference"/>
+            <text variable="page"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <text term="in" text-case="capitalize-first" suffix=": "/>
+          <text macro="editor" suffix=" "/>
+          <text variable="container-title" suffix=". "/>
+          <text macro="edition" suffix=" "/>
+          <group suffix="." delimiter="">
+            <text macro="book-publisher"/>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else-if>
+        <else-if type="article-journal">
+          <group suffix="." delimiter="">
+            <text macro="journal"/>
+            <text variable="page" prefix=": "/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix="." delimiter=" ">
             <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
+              <text variable="container-title"/>
+              <text variable="volume"/>
             </group>
-         </if>
-         <else>
-            <text variable="edition"/>
-         </else>
+            <text macro="year"/>
+            <text variable="page"/>
+          </group>
+          <text variable="URL" prefix=" "/>
+        </else>
       </choose>
-   </macro>
-   <citation>
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout prefix="[" suffix="]" delimiter=",">
-         <group delimiter=":">
-            <text variable="citation-number"/>
-            <text variable="locator"/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush" entry-spacing="0">
-      <sort>
-         <key macro="author"/>
-         <key variable="issued"/>
-      </sort>
-      <layout suffix=".">
-         <text variable="citation-number" prefix="[" suffix="]"/>
-         <text macro="author" suffix=". "/>
-         <text macro="title" suffix=". "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <text macro="edition" suffix=" "/>
-               <text macro="book-publisher" suffix="."/>
-            </if>
-            <else-if type="paper-conference">
-               <group suffix="." delimiter=", ">
-                  <text macro="conference"/>
-                  <text variable="page"/>
-               </group>
-            </else-if>
-            <else-if type="chapter paper-conference" match="any">
-               <text term="in" text-case="capitalize-first" suffix=": "/>
-               <text macro="editor" suffix=" "/>
-               <text variable="container-title" suffix=". "/>
-               <text macro="edition" suffix=" "/>
-               <group suffix="." delimiter="">
-                  <text macro="book-publisher"/>
-                  <text variable="page" prefix=": "/>
-               </group>
-            </else-if>
-            <else-if type="article-journal">
-               <group suffix="." delimiter="">
-                  <text macro="journal"/>
-                  <text variable="page" prefix=": "/>
-               </group>
-            </else-if>
-            <else>
-               <group suffix="." delimiter=" ">
-                  <group delimiter=" ">
-                     <text variable="container-title"/>
-                     <text variable="volume"/>
-                  </group>
-                  <text macro="year"/>
-                  <text variable="page"/>
-               </group>
-               <text variable="URL" prefix=" "/>
-            </else>
-         </choose>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </layout>
+  </bibliography>
+</style>
diff --git a/naa-simple.csl b/naa-simple.csl
index f2953c6b27..d7368f92cc 100644
--- a/naa-simple.csl
+++ b/naa-simple.csl
@@ -1,38 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>National Archives of Australia</title>
-      <id>http://www.zotero.org/styles/naa-simple</id>
-      <link href="http://www.zotero.org/styles/naa-simple" rel="self"/>
-      <link href="http://naa.gov.au/about-us/publications/fact-sheets/fs07.aspx" rel="documentation"/>
-      <author>
-         <name>Tim Sherratt</name>
-         <email>tim@discontents.com.au</email>
-      </author>
-      <summary>National Archives of Australia - simple citations</summary>
-      <updated>2008-06-04T09:36:09+00:00</updated>
-   </info>
-   <macro name="sort-key">
-      <text variable="archive_location"/>
-      <text variable="title"/>
-   </macro>
-   <citation>
-      <layout>
-         <text prefix="NAA: " variable="archive_location"/>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true">
-      <sort>
-         <key macro="sort-key"/>
-      </sort>
-      <layout suffix=".">
-         <group delimiter=", " prefix="National Archives of Australia: ">
-            <text variable="archive_location"/>
-            <text variable="title" prefix="‘" suffix="’"/>
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </group>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+  <info>
+    <title>National Archives of Australia</title>
+    <id>http://www.zotero.org/styles/naa-simple</id>
+    <link href="http://www.zotero.org/styles/naa-simple" rel="self"/>
+    <link href="http://naa.gov.au/about-us/publications/fact-sheets/fs07.aspx" rel="documentation"/>
+    <author>
+      <name>Tim Sherratt</name>
+      <email>tim@discontents.com.au</email>
+    </author>
+    <summary>National Archives of Australia - simple citations</summary>
+    <updated>2008-06-04T09:36:09+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="sort-key">
+    <text variable="archive_location"/>
+    <text variable="title"/>
+  </macro>
+  <citation>
+    <layout>
+      <text prefix="NAA: " variable="archive_location"/>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="sort-key"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", " prefix="National Archives of Australia: ">
+        <text variable="archive_location"/>
+        <text variable="title" prefix="‘" suffix="’"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/nature-neuroscience-brief-communication.csl b/nature-neuroscience-brief-communication.csl
index ec7e7227ba..4cc71673c0 100644
--- a/nature-neuroscience-brief-communication.csl
+++ b/nature-neuroscience-brief-communication.csl
@@ -1,69 +1,70 @@
 <?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">
-   <info>
-      <title>Nature Neuroscience Brief Communication</title>
-      <id>http://www.zotero.org/styles/nature-neuroscience-brief-communication</id>
-      <link href="http://www.zotero.org/styles/nature-neuroscience-brief-communication" rel="self"/>
-      <author>
-         <name>Martin Novak</name>
-         <email>m.novak@dkfz-heidelberg.de</email>
-      </author>
-      <category field="biology"/>
-      <category citation-format="numeric"/>
-      <updated>2009-09-28T20:22:16+00:00</updated>
-   </info>
-   <macro name="author">
-      <names variable="author">
-         <name sort-separator=", " delimiter=", " and="symbol" initialize-with="." delimiter-precedes-last="never" name-as-sort-order="all"/>
-      </names>
-   </macro>
-   <macro name="access">
-      <choose>
-         <if variable="volume"/>
-         <else-if variable="DOI">
-            <text variable="DOI" prefix="doi:"/>
-         </else-if>
-         <else-if variable="URL">
-            <text term="at"/>
-            <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="issuance">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <group prefix=" (" suffix=").">
-               <text variable="publisher" suffix=": "/>
-               <text variable="publisher-place" suffix=", "/>
-               <date variable="issued">
-                  <date-part name="year"/>
-               </date>
-            </group>
-         </if>
-         <else>
-            <date prefix=" (" suffix=")." variable="issued">
-               <date-part name="year"/>
-            </date>
-         </else>
-      </choose>
-   </macro>
-   <citation collapse="citation-number">
-      <sort>
-         <key variable="citation-number"/>
-      </sort>
-      <layout vertical-align="sup" delimiter=",">
-         <text variable="citation-number"/>
-      </layout>
-   </citation>
-   <bibliography et-al-min="6" et-al-use-first="1" second-field-align="flush" entry-spacing="0">
-      <layout>
-         <text variable="citation-number" suffix="."/>
-         <text macro="author"/>
-         <text variable="container-title" font-style="italic" prefix=" " suffix=" " form="short"/>
-         <text variable="volume" suffix=", " font-weight="bold"/>
-         <text variable="page"/>
-         <text macro="issuance"/>
-         <text macro="access"/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+  <info>
+    <title>Nature Neuroscience Brief Communication</title>
+    <id>http://www.zotero.org/styles/nature-neuroscience-brief-communication</id>
+    <link href="http://www.zotero.org/styles/nature-neuroscience-brief-communication" rel="self"/>
+    <author>
+      <name>Martin Novak</name>
+      <email>m.novak@dkfz-heidelberg.de</email>
+    </author>
+    <category field="biology"/>
+    <category citation-format="numeric"/>
+    <updated>2009-09-28T20:22:16+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="author">
+    <names variable="author">
+      <name sort-separator=", " delimiter=", " and="symbol" initialize-with="." delimiter-precedes-last="never" name-as-sort-order="all"/>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="volume"/>
+      <else-if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </else-if>
+      <else-if variable="URL">
+        <text term="at"/>
+        <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issuance">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <group prefix=" (" suffix=").">
+          <text variable="publisher" suffix=": "/>
+          <text variable="publisher-place" suffix=", "/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+      <else>
+        <date prefix=" (" suffix=")." variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout vertical-align="sup" delimiter=",">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="6" et-al-use-first="1" second-field-align="flush" entry-spacing="0">
+    <layout>
+      <text variable="citation-number" suffix="."/>
+      <text macro="author"/>
+      <text variable="container-title" font-style="italic" prefix=" " suffix=" " form="short"/>
+      <text variable="volume" suffix=", " font-weight="bold"/>
+      <text variable="page"/>
+      <text macro="issuance"/>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/palaeontologia-electronica.csl b/palaeontologia-electronica.csl
index a663af1baa..025ab3a82b 100644
--- a/palaeontologia-electronica.csl
+++ b/palaeontologia-electronica.csl
@@ -1,238 +1,239 @@
 <?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">
-   <info>
-      <title>Palaeontologia Electronica</title>
-      <id>http://www.zotero.org/styles/palaeontologia-electronica</id>
-      <link href="http://www.zotero.org/styles/palaeontologia-electronica" rel="self"/>
-      <author>
-         <name>Heinrich Mallison</name>
-         <email>heinrich.mallison@mfn-berlin.de</email>
-      </author>
-      <category citation-format="author-date"/>
-      <updated>2010-09-19T01:22:00+00:00</updated>
-   </info>
-   <macro name="container-contributors">
-      <choose>
-         <if type="chapter paper-conference" match="any">
-            <text term="in" text-case="capitalize-first" suffix=" "/>
-            <names variable="editor translator" delimiter=", " suffix=", ">
-               <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with="." delimiter=", "/>
-               <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
-            </names>
-         </if>
-      </choose>
-   </macro>
-   <macro name="secondary-contributors">
+  <info>
+    <title>Palaeontologia Electronica</title>
+    <id>http://www.zotero.org/styles/palaeontologia-electronica</id>
+    <link href="http://www.zotero.org/styles/palaeontologia-electronica" rel="self"/>
+    <author>
+      <name>Heinrich Mallison</name>
+      <email>heinrich.mallison@mfn-berlin.de</email>
+    </author>
+    <category citation-format="author-date"/>
+    <updated>2010-09-19T01:22:00+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" text-case="capitalize-first" suffix=" "/>
+        <names variable="editor translator" delimiter=", " suffix=", ">
+          <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with="." delimiter=", "/>
+          <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="secondary-contributors">
+    <choose>
+      <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" suffix="." strip-periods="true"/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="author">
+    <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="capitalize-first" strip-periods="true"/>
+      <substitute>
+        <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" and="text" sort-separator=", " delimiter=", " initialize-with="."/>
+      <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="access">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="doi:"/>
+      </if>
+      <else>
+        <group>
+          <text term="retrieved" text-case="capitalize-first" suffix=" "/>
+          <date variable="accessed" suffix=", ">
+            <date-part name="month" suffix=" "/>
+            <date-part name="day" suffix=", "/>
+            <date-part name="year"/>
+          </date>
+          <group>
+            <text term="from" suffix=" "/>
+            <text variable="URL"/>
+          </group>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="genre" suffix=", "/>
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="event">
+    <choose>
+      <if variable="event">
+        <text term="presented at" text-case="capitalize-first" suffix=" "/>
+        <text variable="event"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="issued-year">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" suffix="." strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper" match="any">
+        <group prefix=" " delimiter=":">
+          <group>
+            <text variable="volume"/>
+          </group>
+          <text variable="page"/>
+        </group>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
+        <group delimiter=", ">
+          <text macro="edition"/>
+          <group>
+            <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
+            <number variable="number-of-volumes" form="numeric" prefix=" 1-"/>
+          </group>
+          <group>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <text variable="page"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group>
+      <label variable="locator" form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </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">
+    <sort>
+      <key variable="issued"/>
+      <key macro="author"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <text macro="issued-year"/>
+        <text macro="day-month" suffix=". "/>
+        <text macro="citation-locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="99" et-al-use-first="99" entry-spacing="0" line-spacing="2">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author" suffix=". "/>
+      <text macro="issued" suffix=". "/>
+      <text macro="day-month" suffix=". "/>
       <choose>
-         <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" suffix="." strip-periods="true"/>
-            </names>
-         </if>
-      </choose>
-   </macro>
-   <macro name="day-month">
-      <date variable="issued">
-         <date-part name="month"/>
-         <date-part name="day" prefix=" "/>
-      </date>
-   </macro>
-   <macro name="author">
-      <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="capitalize-first" strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
+        <if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper" match="any">
+          <group delimiter=". ">
             <text macro="title"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="author-short">
-      <names variable="author">
-         <name form="short" name-as-sort-order="all" and="text" sort-separator=", " delimiter=", " initialize-with="."/>
-         <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="access">
-      <choose>
-         <if variable="DOI">
-            <text variable="DOI" prefix="doi:"/>
-         </if>
-         <else>
             <group>
-               <text term="retrieved" text-case="capitalize-first" suffix=" "/>
-               <date variable="accessed" suffix=", ">
-                  <date-part name="month" suffix=" "/>
-                  <date-part name="day" suffix=", "/>
-                  <date-part name="year"/>
-               </date>
-               <group>
-                  <text term="from" suffix=" "/>
-                  <text variable="URL"/>
-               </group>
+              <text macro="container-contributors"/>
+              <text macro="secondary-contributors"/>
+              <group delimiter=": ">
+                <text variable="container-title" font-style="italic"/>
+                <text variable="collection-title"/>
+              </group>
             </group>
-         </else>
-      </choose>
-   </macro>
-   <macro name="title">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
-            <text variable="title" font-style="italic"/>
-         </if>
-         <else>
-            <text variable="title"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <text variable="genre" suffix=", "/>
-      <group delimiter=", ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
-      </group>
-   </macro>
-   <macro name="event">
-      <choose>
-         <if variable="event">
-            <text term="presented at" text-case="capitalize-first" suffix=" "/>
-            <text variable="event"/>
-         </if>
-      </choose>
-   </macro>
-   <macro name="issued">
-      <date variable="issued">
-         <date-part name="year"/>
-      </date>
-   </macro>
-   <macro name="issued-year">
-      <choose>
-         <if variable="issued">
-            <date variable="issued">
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else>
-            <text term="no date" form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="edition">
-      <choose>
-         <if is-numeric="edition">
-            <group delimiter=" ">
-               <number variable="edition" form="ordinal"/>
-               <text term="edition" form="short" suffix="." strip-periods="true"/>
+          </group>
+          <text macro="locators"/>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <text macro="title" suffix=", p. "/>
+          <text macro="locators" suffix=". "/>
+          <group>
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <group delimiter=". ">
+              <text variable="container-title" font-style="italic"/>
+              <text variable="collection-title"/>
             </group>
-         </if>
-         <else>
-            <text variable="edition" suffix="."/>
-         </else>
+          </group>
+        </else-if>
       </choose>
-   </macro>
-   <macro name="locators">
-      <choose>
-         <if type="article-journal article-magazine article-newspaper" match="any">
-            <group prefix=" " delimiter=":">
-               <group>
-                  <text variable="volume"/>
-               </group>
-               <text variable="page"/>
-            </group>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
-            <group delimiter=", ">
-               <text macro="edition"/>
-               <group>
-                  <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=". " strip-periods="true"/>
-                  <number variable="number-of-volumes" form="numeric" prefix=" 1-"/>
-               </group>
-               <group>
-                  <number variable="volume" form="numeric"/>
-               </group>
-               <group>
-                  <text variable="page"/>
-               </group>
-            </group>
-         </else-if>
-      </choose>
-   </macro>
-   <macro name="citation-locator">
-      <group>
-         <label variable="locator" form="short"/>
-         <text variable="locator" prefix=" "/>
+      <group delimiter=". " prefix=". ">
+        <group delimiter=", ">
+          <text macro="event"/>
+          <text macro="publisher"/>
+        </group>
+        <text macro="access"/>
       </group>
-   </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">
-      <sort>
-         <key variable="issued"/>
-         <key macro="author"/>
-      </sort>
-      <layout prefix="(" suffix=")" delimiter="; ">
-         <group delimiter=" ">
-            <text macro="author-short"/>
-            <text macro="issued-year"/>
-            <text macro="day-month" suffix=". "/>
-            <text macro="citation-locator"/>
-         </group>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="99" et-al-use-first="99" entry-spacing="0" line-spacing="2">
-      <sort>
-         <key macro="author"/>
-         <key variable="issued"/>
-      </sort>
-      <layout suffix=".">
-         <text macro="author" suffix=". "/>
-         <text macro="issued" suffix=". "/>
-         <text macro="day-month" suffix=". "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper" match="any">
-               <group delimiter=". ">
-                  <text macro="title"/>
-                  <group>
-                     <text macro="container-contributors"/>
-                     <text macro="secondary-contributors"/>
-                     <group delimiter=": ">
-                        <text variable="container-title" font-style="italic"/>
-                        <text variable="collection-title"/>
-                     </group>
-                  </group>
-               </group>
-               <text macro="locators"/>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <text macro="title" suffix=", p. "/>
-               <text macro="locators" suffix=". "/>
-               <group>
-                  <text macro="container-contributors"/>
-                  <text macro="secondary-contributors"/>
-                  <group delimiter=". ">
-                     <text variable="container-title" font-style="italic"/>
-                     <text variable="collection-title"/>
-                  </group>
-               </group>
-            </else-if>
-         </choose>
-         <group delimiter=". " prefix=". ">
-            <group delimiter=", ">
-               <text macro="event"/>
-               <text macro="publisher"/>
-            </group>
-            <text macro="access"/>
-         </group>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+    </layout>
+  </bibliography>
+</style>
diff --git a/ro-humanities.csl b/ro-humanities.csl
index 7e773bf962..2c5d803362 100644
--- a/ro-humanities.csl
+++ b/ro-humanities.csl
@@ -1,353 +1,354 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>Romanian Humanities</title>
-      <id>http://www.zotero.org/styles/ro-humanities</id>
-      <link href="http://www.zotero.org/styles/ro-humanities" rel="self"/>
-      <author>
-         <name>Nicolae Turcan</name>
-         <email>nturcan@gmail.com</email>
-      </author>
-      <category field="humanities"/>
-      <category field="generic-base"/>
-      <category citation-format="numeric"/>
-      <updated>2009-02-22T16:10:10</updated>
-   </info>
-   <macro name="editor">
-      <names variable="editor" delimiter=", ">
-         <label form="verb" text-case="lowercase"/>
-         <name delimiter=", " prefix=" " delimiter-precedes-last="always"/>
-      </names>
-   </macro>
-   <macro name="translator">
-      <names variable="translator" delimiter=", ">
-         <label form="verb" text-case="lowercase"/>
-         <name and="text" delimiter=", " prefix=" " delimiter-precedes-last="never"/>
-      </names>
-   </macro>
-    <macro name="editor-short">
-     <choose>
-       <if variable="author">
-	 <choose>
-	   <if variable="editor">
-	     <names variable="editor" delimiter=", ">
-	       <name delimiter=", " delimiter-precedes-last="always"/>
-	       <label form="short" text-case="lowercase" prefix=" (" suffix=".)" strip-periods="true"/>
-	     </names>
-	   </if>
-	   <else-if variable="container-author">
-	     <names variable="container-author" delimiter=", ">
-	       <name delimiter=", " delimiter-precedes-last="always"/>
-	     </names>
-	   </else-if>
-	 </choose>
-       </if>
-     </choose>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name delimiter=", " delimiter-precedes-last="always" sort-separator=", "/>
-         <substitute>
-            <names variable="editor"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="author-bib">
-      <names variable="author">
-         <name name-as-sort-order="all" form="long" delimiter="; " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
-         <substitute>
-            <names variable="editor" font-variant="small-caps"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="recipient">
-      <names variable="recipient" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="interviewer">
-      <names variable="interviewer" delimiter=", ">
-         <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
-         <name and="text" delimiter=", "/>
-      </names>
-   </macro>
-   <macro name="access">
+  <info>
+    <title>Romanian Humanities</title>
+    <id>http://www.zotero.org/styles/ro-humanities</id>
+    <link href="http://www.zotero.org/styles/ro-humanities" rel="self"/>
+    <author>
+      <name>Nicolae Turcan</name>
+      <email>nturcan@gmail.com</email>
+    </author>
+    <category field="humanities"/>
+    <category field="generic-base"/>
+    <category citation-format="numeric"/>
+    <updated>2009-02-22T16:10:10</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="verb" text-case="lowercase"/>
+      <name delimiter=", " prefix=" " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator" delimiter=", ">
+      <label form="verb" text-case="lowercase"/>
+      <name and="text" delimiter=", " prefix=" " delimiter-precedes-last="never"/>
+    </names>
+  </macro>
+  <macro name="editor-short">
+    <choose>
+      <if variable="author">
+        <choose>
+          <if variable="editor">
+            <names variable="editor" delimiter=", ">
+              <name delimiter=", " delimiter-precedes-last="always"/>
+              <label form="short" text-case="lowercase" prefix=" (" suffix=".)" strip-periods="true"/>
+            </names>
+          </if>
+          <else-if variable="container-author">
+            <names variable="container-author" delimiter=", ">
+              <name delimiter=", " delimiter-precedes-last="always"/>
+            </names>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter=", " delimiter-precedes-last="always" sort-separator=", "/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-bib">
+    <names variable="author">
+      <name name-as-sort-order="all" form="long" delimiter="; " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
+      <substitute>
+        <names variable="editor" font-variant="small-caps"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+        <text variable="URL" text-decoration="underline"/>
+        <group>
+          <text term="accessed" text-case="lowercase" prefix=", "/>
+          <date variable="accessed" prefix=" ">
+            <date-part name="day" suffix=" "/>
+            <date-part name="month" suffix=" " text-case="lowercase"/>
+            <date-part name="year"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </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" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" font-style="italic" form="short"/>
+      </if>
+      <else>
+        <text variable="title" quotes="true" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection-title">
+    <group delimiter=" ">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="graphic report" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" suffix=" " text-case="lowercase"/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" 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=" " text-case="lowercase"/>
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <group>
       <choose>
-         <if variable="URL">
-            <text variable="URL" text-decoration="underline"/>
-            <group>
-               <text term="accessed" text-case="lowercase" prefix=", "/>
-               <date variable="accessed" prefix=" ">
-                  <date-part name="day" suffix=" "/>
-                  <date-part name="month" suffix=" " text-case="lowercase"/>
-                  <date-part name="year"/>
-               </date>
-            </group>
-         </if>
-      </choose>
-   </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" quotes="true"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="title-short">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" font-style="italic" form="short"/>
-         </if>
-         <else>
-            <text variable="title" quotes="true" form="short"/>
-         </else>
+        <if locator="page">
+          <label variable="locator" suffix="." form="short" strip-periods="true"/>
+          <text variable="locator" prefix=" "/>
+        </if>
+        <else>
+          <text variable="locator"/>
+        </else>
       </choose>
-   </macro>
-   <macro name="collection-title">
-      <group delimiter=" ">
-         <text variable="collection-title"/>
-         <text variable="collection-number"/>
-      </group>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=", ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
-      </group>
-   </macro>
-   <macro name="issued">
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" suffix="." strip-periods="true"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" suffix="." form="short" strip-periods="true"/>
+      <text variable="page" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="sort-key">
+    <text macro="author-bib" suffix=" "/>
+    <text variable="issue" suffix=" "/>
+    <text variable="genre"/>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout prefix="" suffix="." delimiter="; ">
       <choose>
-         <if type="graphic report" match="any">
-            <date variable="issued">
-               <date-part name="day" suffix=" "/>
-               <date-part name="month" suffix=" " text-case="lowercase"/>
-               <date-part name="year"/>
-            </date>
-         </if>
-         <else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" 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=" " text-case="lowercase"/>
-               <date-part name="year"/>
-            </date>
-         </else>
-      </choose>
-   </macro>
-   <macro name="locators">
-      <group>
-         <choose>
-            <if locator="page">
-               <label variable="locator" suffix="." form="short" strip-periods="true"/>
-               <text variable="locator" prefix=" "/>
-            </if>
-            <else>
-               <text variable="locator"/>
-            </else>
-         </choose>
-      </group>
-   </macro>
-   <macro name="volume">
-      <group delimiter=" ">
-         <text term="volume" form="short" suffix="." strip-periods="true"/>
-         <text variable="volume"/>
-      </group>
-   </macro>
-   <macro name="pages">
-      <group>
-         <label variable="page" suffix="." form="short" strip-periods="true"/>
-         <text variable="page" prefix=" "/>
-      </group>
-   </macro>
-   <macro name="sort-key">
-      <text macro="author-bib" suffix=" "/>
-      <text variable="issue" suffix=" "/>
-      <text variable="genre"/>
-   </macro>
-   <citation et-al-min="4" et-al-use-first="1" et-al-subsequent-min="4" et-al-subsequent-use-first="1" disambiguate-add-year-suffix="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
-      <layout prefix="" suffix="." delimiter="; ">
-         <choose>
-            <if position="ibid-with-locator">
-               <group delimiter=", ">
-                  <text term="ibid" form="long" font-style="italic"/>
-                  <text macro="locators"/>
-               </group>
-            </if>
-            <else-if position="ibid">
-               <text term="ibid" form="long" font-style="italic"/>
-            </else-if>
-            <else-if position="subsequent">
-               <group>
-                  <group delimiter=", ">
-                     <text macro="author"/>
-                     <text macro="recipient"/>
-                  </group>
-                  <choose>
-                     <if type="chapter paper-conference article-journal article-magazine article-newspaper interview" match="any">
-                        <text macro="title-short" prefix=", "/>
-                     </if>
-                     <else>
-                        <group delimiter=", " prefix=", ">
-                           <text macro="title-short"/>
-                           <text macro="volume"/>
-                           <choose>
-                              <if locator="page" match="none">
-                                 <text macro="locators" prefix=", "/>
-                              </if>
-                           </choose>
-                        </group>
-                     </else>
-                  </choose>
+        <if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" form="long" font-style="italic"/>
+            <text macro="locators"/>
+          </group>
+        </if>
+        <else-if position="ibid">
+          <text term="ibid" form="long" font-style="italic"/>
+        </else-if>
+        <else-if position="subsequent">
+          <group>
+            <group delimiter=", ">
+              <text macro="author"/>
+              <text macro="recipient"/>
+            </group>
+            <choose>
+              <if type="chapter paper-conference article-journal article-magazine article-newspaper interview" match="any">
+                <text macro="title-short" prefix=", "/>
+              </if>
+              <else>
+                <group delimiter=", " prefix=", ">
+                  <text macro="title-short"/>
+                  <text macro="volume"/>
                   <choose>
-                     <if type="interview">
-                        <text term="interview" text-case="lowercase" prefix=", "/>
-                     </if>
-                     <else-if variable="recipient">
-                        <text macro="issued" prefix=", "/>
-                     </else-if>
+                    <if locator="page" match="none">
+                      <text macro="locators" prefix=", "/>
+                    </if>
                   </choose>
-                  <text macro="locators" prefix=", "/>
-               </group>
-            </else-if>
-            <else>
-               <group suffix=", ">
-                  <text macro="author"/>
-                  <text macro="recipient"/>
-               </group>
-               <text macro="title"/>
-               <choose>
-                  <if locator="page" match="none">
-                     <text macro="locators" prefix=", "/>
-                  </if>
-               </choose>
-               <choose>
-                  <if type="chapter paper-conference" match="any">
-                     <group>
-                        <text term="in" text-case="lowercase" prefix=", "/>
-                        <group delimiter=", " prefix=" ">
-                           <text macro="editor-short"/>
-                           <text variable="container-title" font-style="italic"/>
-                        </group>
-                        <text macro="volume" prefix=", "/>
-                     </group>
-                     <text macro="collection-title" prefix=", "/>
-                     <text macro="translator" prefix=", "/>
-                     <text variable="edition" prefix=", "/>
-                     <text macro="publisher" prefix=", "/>
-                     <text macro="issued" prefix=", "/>
-                  </if>
-                  <else-if type="article-journal article-newspaper article-magazine interview" match="any">
-                     <group>
-                        <text macro="interviewer" prefix=", "/>
-                        <group>
-                           <text variable="container-title" font-style="italic" prefix=", "/>
-                           <text macro="volume" prefix=", "/>
-                           <text variable="issue" prefix=", nr. "/>
-                        </group>
-                        <text macro="issued" prefix=", "/>
-                        <text macro="editor" prefix=", "/>
-                        <text macro="translator" prefix=", "/>
-                        <text variable="edition" prefix=", "/>
-                        <text macro="publisher" prefix=", "/>
-                     </group>
-                  </else-if>
-                  <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-                     <text macro="volume" prefix=", "/>
-                     <text macro="collection-title" prefix=", "/>
-                     <text macro="translator" prefix=", "/>
-                     <text macro="editor" prefix=", "/>
-                     <text variable="edition" prefix=", "/>
-                     <text macro="publisher" prefix=", "/>
-                     <text macro="issued" prefix=", "/>
-                  </else-if>
-                  <else>
-                     <group>
-                        <text variable="container-title" font-style="italic" prefix=", "/>
-                        <group prefix=", ">
-                           <text macro="volume"/>
-                           <text variable="issue" prefix=", nr. "/>
-                        </group>
-                     </group>
-                  </else>
-               </choose>
-               <choose>
-                  <if locator="page" match="any">
-                     <text macro="locators" prefix=", "/>
-                  </if>
-               </choose>
-               <text macro="access" prefix=", "/>
-            </else>
-         </choose>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" entry-spacing="0">
-      <sort>
-         <key macro="sort-key"/>
-      </sort>
-      <layout suffix=".">
-         <text macro="author-bib" suffix=", "/>
-         <text macro="title"/>
-         <choose>
-            <if type="chapter paper-conference" match="any">
-               <group>
-                  <text term="in" text-case="lowercase" prefix=", "/>
-                  <group delimiter=", " prefix=" ">
-                     <text macro="editor-short"/>
-                     <text variable="container-title" font-style="italic"/>
-                  </group>
-                  <text macro="volume" prefix=", "/>
-               </group>
-               <group delimiter=", " prefix=", ">
-                  <text macro="collection-title"/>
-                  <text macro="translator"/>
-                  <text variable="edition"/>
-                  <text macro="publisher"/>
-                  <text macro="issued"/>
-                  <text macro="pages"/>
-               </group>
+                </group>
+              </else>
+            </choose>
+            <choose>
+              <if type="interview">
+                <text term="interview" text-case="lowercase" prefix=", "/>
+              </if>
+              <else-if variable="recipient">
+                <text macro="issued" prefix=", "/>
+              </else-if>
+            </choose>
+            <text macro="locators" prefix=", "/>
+          </group>
+        </else-if>
+        <else>
+          <group suffix=", ">
+            <text macro="author"/>
+            <text macro="recipient"/>
+          </group>
+          <text macro="title"/>
+          <choose>
+            <if locator="page" match="none">
+              <text macro="locators" prefix=", "/>
             </if>
-            <else-if type="article-journal article-newspaper article-magazine" match="any">
-               <group delimiter=", " prefix=", ">
+          </choose>
+          <choose>
+            <if type="chapter paper-conference" match="any">
+              <group>
+                <text term="in" text-case="lowercase" prefix=", "/>
+                <group delimiter=", " prefix=" ">
+                  <text macro="editor-short"/>
                   <text variable="container-title" font-style="italic"/>
-                  <text macro="volume"/>
-                  <text variable="issue" prefix="nr. "/>
-                  <text macro="issued"/>
-                  <text macro="editor"/>
-                  <text macro="translator"/>
-                  <text variable="edition"/>
-                  <text macro="publisher"/>
-                  <text macro="pages"/>
-               </group>
+                </group>
+                <text macro="volume" prefix=", "/>
+              </group>
+              <text macro="collection-title" prefix=", "/>
+              <text macro="translator" prefix=", "/>
+              <text variable="edition" prefix=", "/>
+              <text macro="publisher" prefix=", "/>
+              <text macro="issued" prefix=", "/>
+            </if>
+            <else-if type="article-journal article-newspaper article-magazine interview" match="any">
+              <group>
+                <text macro="interviewer" prefix=", "/>
+                <group>
+                  <text variable="container-title" font-style="italic" prefix=", "/>
+                  <text macro="volume" prefix=", "/>
+                  <text variable="issue" prefix=", nr. "/>
+                </group>
+                <text macro="issued" prefix=", "/>
+                <text macro="editor" prefix=", "/>
+                <text macro="translator" prefix=", "/>
+                <text variable="edition" prefix=", "/>
+                <text macro="publisher" prefix=", "/>
+              </group>
             </else-if>
             <else-if type="bill book graphic legal_case motion_picture report song" match="any">
-               <group delimiter=", " prefix=", ">
-                  <text macro="volume"/>
-                  <text macro="collection-title"/>
-                  <text macro="translator"/>
-                  <text macro="editor"/>
-                  <text variable="edition"/>
-                  <text macro="publisher"/>
-                  <text macro="issued"/>
-               </group>
+              <text macro="volume" prefix=", "/>
+              <text macro="collection-title" prefix=", "/>
+              <text macro="translator" prefix=", "/>
+              <text macro="editor" prefix=", "/>
+              <text variable="edition" prefix=", "/>
+              <text macro="publisher" prefix=", "/>
+              <text macro="issued" prefix=", "/>
             </else-if>
             <else>
-               <group delimiter=", " prefix=", ">
-                  <text variable="container-title" font-style="italic"/>
+              <group>
+                <text variable="container-title" font-style="italic" prefix=", "/>
+                <group prefix=", ">
                   <text macro="volume"/>
-                  <text variable="issue" prefix="nr. "/>
-               </group>
+                  <text variable="issue" prefix=", nr. "/>
+                </group>
+              </group>
             </else>
-         </choose>
-         <text macro="locators" prefix=", "/>
-         <text macro="access" prefix=", "/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+          </choose>
+          <choose>
+            <if locator="page" match="any">
+              <text macro="locators" prefix=", "/>
+            </if>
+          </choose>
+          <text macro="access" prefix=", "/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6" entry-spacing="0">
+    <sort>
+      <key macro="sort-key"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author-bib" suffix=", "/>
+      <text macro="title"/>
+      <choose>
+        <if type="chapter paper-conference" match="any">
+          <group>
+            <text term="in" text-case="lowercase" prefix=", "/>
+            <group delimiter=", " prefix=" ">
+              <text macro="editor-short"/>
+              <text variable="container-title" font-style="italic"/>
+            </group>
+            <text macro="volume" prefix=", "/>
+          </group>
+          <group delimiter=", " prefix=", ">
+            <text macro="collection-title"/>
+            <text macro="translator"/>
+            <text variable="edition"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+            <text macro="pages"/>
+          </group>
+        </if>
+        <else-if type="article-journal article-newspaper article-magazine" match="any">
+          <group delimiter=", " prefix=", ">
+            <text variable="container-title" font-style="italic"/>
+            <text macro="volume"/>
+            <text variable="issue" prefix="nr. "/>
+            <text macro="issued"/>
+            <text macro="editor"/>
+            <text macro="translator"/>
+            <text variable="edition"/>
+            <text macro="publisher"/>
+            <text macro="pages"/>
+          </group>
+        </else-if>
+        <else-if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter=", " prefix=", ">
+            <text macro="volume"/>
+            <text macro="collection-title"/>
+            <text macro="translator"/>
+            <text macro="editor"/>
+            <text variable="edition"/>
+            <text macro="publisher"/>
+            <text macro="issued"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", " prefix=", ">
+            <text variable="container-title" font-style="italic"/>
+            <text macro="volume"/>
+            <text variable="issue" prefix="nr. "/>
+          </group>
+        </else>
+      </choose>
+      <text macro="locators" prefix=", "/>
+      <text macro="access" prefix=", "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/sp-legal.csl b/sp-legal.csl
index cc89c81a03..1f2581b356 100644
--- a/sp-legal.csl
+++ b/sp-legal.csl
@@ -5,40 +5,41 @@
     <id>http://www.zotero.org/styles/sp-legal</id>
     <link href="http://www.zotero.org/styles/sp-legal" rel="self"/>
     <author>
-      <name>Rafael Palomino based on Spanish Legal by Pedro Herrera who started on Romanian Humanities by Nicolae Turcan</name>         
+      <name>Rafael Palomino based on Spanish Legal by Pedro Herrera who started on Romanian Humanities by Nicolae Turcan</name>
       <email>rpalominolozano@gmail.com</email>
     </author>
     <category field="law"/>
     <category citation-format="note"/>
     <updated>2011-05-12T00:16:08+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <locale>
     <terms>
       <term name="editor" form="short">
-	<single>ed.</single>
-	<multiple>eds.</multiple>
+        <single>ed.</single>
+        <multiple>eds.</multiple>
       </term>
       <term name="editor">
-	<single>ed.</single>
-	<multiple>eds.</multiple>
+        <single>ed.</single>
+        <multiple>eds.</multiple>
       </term>
       <term name="et-al">y otros</term>
       <term name="and">y</term>
       <term name="page" form="short">
-	<single>pág.</single>
-	<multiple>págs.</multiple>
+        <single>pág.</single>
+        <multiple>págs.</multiple>
       </term>
       <term name="page">
-	<single>pág.</single>
-	<multiple>págs.</multiple>
+        <single>pág.</single>
+        <multiple>págs.</multiple>
       </term>
       <term name="chapter" form="short">
-	<single>cap.</single>
-	<multiple>caps.</multiple>
+        <single>cap.</single>
+        <multiple>caps.</multiple>
       </term>
       <term name="chapter">
-	<single>cap.</single>
-	<multiple>caps.</multiple>
+        <single>cap.</single>
+        <multiple>caps.</multiple>
       </term>
       <term name="accessed">fecha de consulta</term>
       <term name="in">en</term>
@@ -54,7 +55,7 @@
       <term name="month-07">Julio</term>
       <term name="month-08">Agosto</term>
       <term name="month-09">Septiembre</term>
-      <term name="month-10">Octubre</term> 
+      <term name="month-10">Octubre</term>
       <term name="month-11">Noviembre</term>
       <term name="month-12">Diciembre</term>
       <term name="at">en</term>
@@ -71,9 +72,9 @@
       <name form="long" initialize-with=". " delimiter="; " delimiter-precedes-last="always" sort-separator=", "/>
       <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
       <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="title"/>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
@@ -82,9 +83,9 @@
       <name name-as-sort-order="all" form="long" initialize-with=". " delimiter="; " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
       <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
       <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="title"/>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
       </substitute>
     </names>
   </macro>
@@ -92,33 +93,33 @@
     <group>
       <text term="accessed" suffix=" "/>
       <date variable="accessed" suffix=", ">
-	<date-part name="day" suffix=" "/>
-	<date-part name="month" suffix=" " text-case="lowercase"/>
-	<date-part name="year"/>
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" " text-case="lowercase"/>
+        <date-part name="year"/>
       </date>
       <group>
-	<text term="at" suffix=" "/>
-	<text variable="URL"/>
+        <text term="at" suffix=" "/>
+        <text variable="URL"/>
       </group>
     </group>
   </macro>
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case motion_picture report song" match="any">
-	<text variable="title" text-case="capitalize-first" font-style="italic"/>
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
       <else>
-	<text variable="title" text-case="capitalize-first" prefix="“" suffix="”"/>
+        <text variable="title" text-case="capitalize-first" prefix="“" suffix="”"/>
       </else>
     </choose>
   </macro>
   <macro name="title-short">
     <choose>
       <if type="bill book graphic legal_case motion_picture report song" match="any">
-	<text variable="title" text-case="capitalize-first" font-style="italic" suffix=", cit." form="short"/>
+        <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", cit." form="short"/>
       </if>
       <else>
-	<text variable="title" text-case="capitalize-first" prefix="“" suffix="”, cit." form="short"/>
+        <text variable="title" text-case="capitalize-first" prefix="“" suffix="”, cit." form="short"/>
       </else>
     </choose>
   </macro>
@@ -135,153 +136,153 @@
     </sort>
     <layout suffix="." delimiter="; ">
       <choose>
-	<if position="first">
-	  <choose>
-	    <if type="bill book graphic legal_case motion_picture report song" match="any">
-	      <group delimiter=", ">
-		<text macro="author" font-variant="small-caps"/>
-		<group delimiter=" ">
-		  <text macro="title"/>
-		  <!-- Here will be the original-date, when zotero will have an ui field for it.
+        <if position="first">
+          <choose>
+            <if type="bill book graphic legal_case motion_picture report song" match="any">
+              <group delimiter=", ">
+                <text macro="author" font-variant="small-caps"/>
+                <group delimiter=" ">
+                  <text macro="title"/>
+                  <!-- Here will be the original-date, when zotero will have an ui field for it.
 		       <date variable="original-date" prefix="(" suffix=")">
 		       <date-part name="year"/>
 		       </date>
 		  -->
-		</group>
-		<group delimiter=" ">
-		  <text term="volume" form="short" text-case="lowercase"/>
-		  <text variable="volume"/>
-		</group>
-		<text variable="edition"/>
-		<text macro="publisher"/>
-		<date variable="issued">
-		  <date-part name="year"/>
-		</date>
-		<group>
-		  <label variable="locator" form="short"/>
-		  <text variable="locator" prefix=" "/>
-		</group>
-		<text macro="access"/>
-	      </group>
-	    </if>
-	    <else-if type="chapter paper-conference" match="any">
-	      <group delimiter=", ">
-		<text macro="author" font-variant="small-caps"/>
-		<text macro="title"/>
-		<group delimiter=" ">
-		  <text term="in"/>
-		  <names variable="editor translator" delimiter=", ">
-		    <name sort-separator=", "/>
-		    <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
-		  </names>
-		  <text variable="container-title" font-style="italic"/>
-		</group>
-		<group delimiter=" ">
-		  <text term="volume" form="short" text-case="lowercase"/>
-		  <text variable="volume"/>
-		</group>
-		<text variable="edition"/>
-		<text macro="publisher"/>
-		<group>
-		  <date variable="issued">
-		    <date-part name="year"/>
-		  </date>
-		  <text variable="collection-title" prefix=" (" suffix=")"/>
-		</group>
-		<group>
-		  <label variable="locator" form="short"/>
-		  <text variable="locator" prefix=" "/>
-		</group>
-		<text macro="access"/>
-	      </group>
-	    </else-if>
-	    <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-	      <group delimiter=", ">
-		<text macro="author" font-variant="small-caps"/>
-		<text macro="title"/>
-		<text variable="container-title" font-style="italic"/>
-		<group delimiter=" ">
-		  <text term="volume" form="short" text-case="lowercase"/>
-		  <text variable="volume"/>
-		</group>
-		<text variable="issue"/>
-		<date variable="issued">
-		  <date-part name="year"/>
-		</date>
-		<text macro="editor-translator"/>
-		<text variable="edition"/>
-		<group delimiter=" ">
-		  <text macro="publisher"/>
-		  <text variable="collection-title" prefix=" (" suffix=")"/>
-		</group>
-		<group>
-		  <label variable="locator" form="short"/>
-		  <text variable="locator" prefix=" "/>
-		</group>
-		<text macro="access"/>
-	      </group>
-	    </else-if>
-	    <else>
-	      <group delimiter=", ">
-		<text macro="author" font-variant="small-caps"/>
-		<text macro="title"/>
-		<text macro="editor-translator" font-variant="small-caps"/>
-		<group delimiter=", ">
-		  <text variable="container-title" font-style="italic"/>
-		  <group delimiter=" ">
-		    <text term="volume" form="short" text-case="lowercase"/>
-		    <text variable="volume"/>
-		  </group>
-		  <text variable="issue"/>
-		</group>
-		<group>
-		  <label variable="locator" form="short"/>
-		  <text variable="locator" prefix=" "/>
-		</group>
-	      </group>
-	    </else>
-	  </choose>
-	</if>
-	<else-if position="ibid-with-locator">
-	  <group delimiter=", ">
-	    <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
-	    <group>
-	      <label variable="locator" form="short"/>
-	      <text variable="locator" prefix=" "/>
-	    </group>
-	  </group>
-	</else-if>
-	<else-if position="ibid">
-	  <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
-	</else-if>
-	<else-if position="subsequent">
-	  <choose>
-	    <if type="bill book graphic legal_case motion_picture report song" match="any">
-	      <group delimiter=", ">
-		<text macro="author" font-variant="small-caps"/>
-		<text macro="title-short"/>
-		<group delimiter=" ">
-		  <text term="volume" form="short" text-case="lowercase"/>
-		  <text variable="volume"/>
-		</group>
-		<group>
-		  <label variable="locator" form="short"/>
-		  <text variable="locator" prefix=" "/>
-		</group>
-	      </group>
-	    </if>
-	    <else>
-	      <group delimiter=", ">
-		<text macro="author" font-variant="small-caps"/>
-		<text macro="title-short"/>
-		<group>
-		  <label variable="locator" form="short"/>
-		  <text variable="locator" prefix=" "/>
-		</group>
-	      </group>
-	    </else>
-	  </choose>
-	</else-if>
+                </group>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="edition"/>
+                <text macro="publisher"/>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+                <text macro="access"/>
+              </group>
+            </if>
+            <else-if type="chapter paper-conference" match="any">
+              <group delimiter=", ">
+                <text macro="author" font-variant="small-caps"/>
+                <text macro="title"/>
+                <group delimiter=" ">
+                  <text term="in"/>
+                  <names variable="editor translator" delimiter=", ">
+                    <name sort-separator=", "/>
+                    <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
+                  </names>
+                  <text variable="container-title" font-style="italic"/>
+                </group>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="edition"/>
+                <text macro="publisher"/>
+                <group>
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                  <text variable="collection-title" prefix=" (" suffix=")"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+                <text macro="access"/>
+              </group>
+            </else-if>
+            <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+              <group delimiter=", ">
+                <text macro="author" font-variant="small-caps"/>
+                <text macro="title"/>
+                <text variable="container-title" font-style="italic"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="issue"/>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text macro="editor-translator"/>
+                <text variable="edition"/>
+                <group delimiter=" ">
+                  <text macro="publisher"/>
+                  <text variable="collection-title" prefix=" (" suffix=")"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+                <text macro="access"/>
+              </group>
+            </else-if>
+            <else>
+              <group delimiter=", ">
+                <text macro="author" font-variant="small-caps"/>
+                <text macro="title"/>
+                <text macro="editor-translator" font-variant="small-caps"/>
+                <group delimiter=", ">
+                  <text variable="container-title" font-style="italic"/>
+                  <group delimiter=" ">
+                    <text term="volume" form="short" text-case="lowercase"/>
+                    <text variable="volume"/>
+                  </group>
+                  <text variable="issue"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else-if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+            <group>
+              <label variable="locator" form="short"/>
+              <text variable="locator" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if position="ibid">
+          <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+        </else-if>
+        <else-if position="subsequent">
+          <choose>
+            <if type="bill book graphic legal_case motion_picture report song" match="any">
+              <group delimiter=", ">
+                <text macro="author" font-variant="small-caps"/>
+                <text macro="title-short"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </group>
+            </if>
+            <else>
+              <group delimiter=", ">
+                <text macro="author" font-variant="small-caps"/>
+                <text macro="title-short"/>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </group>
+            </else>
+          </choose>
+        </else-if>
       </choose>
     </layout>
   </citation>
@@ -293,107 +294,107 @@
     <layout suffix=".">
       <text macro="author-bibliography" suffix=", "/>
       <choose>
-	<if type="bill book graphic legal_case motion_picture report song" match="any">
-	  <group delimiter=", ">
-	    <group delimiter=" ">
-	      <text macro="title"/>
-	      <!-- Here will be the original-date, when zotero will have an ui field for it.
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter=", ">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <!-- Here will be the original-date, when zotero will have an ui field for it.
 		   <date variable="original-date" prefix="(" suffix=")">
 		   <date-part name="year"/>
 		   </date>
 	      -->
-	    </group>
-	    <group delimiter=" ">
-	      <text term="volume" form="short" text-case="lowercase"/>
-	      <text variable="volume"/>
-	    </group>
-	    <text variable="edition"/>
-	    <text macro="publisher"/>
-	    <date variable="issued">
-	      <date-part name="year"/>
-	    </date>
-	    <group>
-	      <label variable="page" form="short"/>
-	      <text variable="page" prefix=" "/>
-	    </group>
-	  </group>
-	</if>
-	<else-if type="chapter paper-conference" match="any">
-	  <group delimiter=", ">
-	    <text macro="title"/>
-	    <group delimiter=" ">
-	      <text term="in"/>
-	      <names variable="editor translator" delimiter=", ">
-		<name sort-separator=", "/>
-		<label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
-	      </names>
-	      <text variable="container-title" font-style="italic"/>
-	    </group>
-	    <group delimiter=" ">
-	      <text term="volume" form="short" text-case="lowercase"/>
-	      <text variable="volume"/>
-	    </group>
-	    <text variable="edition"/>
-	    <text macro="publisher"/>
-	    <group>
-	      <date variable="issued">
-		<date-part name="year"/>
-	      </date>
-	      <text variable="collection-title" prefix=" (" suffix=")"/>
-	    </group>
-	    <group>
-	      <label variable="page" form="short"/>
-	      <text variable="page" prefix=" "/>
-	    </group>
-	  </group>
-	</else-if>
-	<else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-	  <group delimiter=", ">
-	    <text macro="title"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=" ">
-	      <text term="volume" form="short" text-case="lowercase"/>
-	      <text variable="volume"/>
-	    </group>
-	    <group delimiter=" ">
-	      <text term="issue" form="short" text-case="lowercase"/>
-	      <text variable="issue"/>
-	    </group>
-	    <date variable="issued">
-	      <date-part name="year"/>
-	    </date>
-	    <text variable="edition"/>
-	    <group delimiter=" ">
-	      <text macro="publisher"/>
-	      <text variable="collection-title" prefix="(" suffix=")"/>
-	    </group>
-	    <group>
-	      <label variable="page" form="short" strip-periods="true"/>
-	      <text variable="page" prefix=" "/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group delimiter=", ">
-	    <text macro="title"/>
-	    <text macro="editor-translator"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=" ">
-	      <text term="volume" form="short" text-case="lowercase"/>
-	      <text variable="volume"/>
-	    </group>
-	    <group>
-	      <text term="issue" form="short" text-case="lowercase"/>
-	      <text variable="issue"/>
-	    </group>
-	    <group>
-	      <label variable="page" form="short" strip-periods="true"/>
-	      <text variable="page" prefix=" "/>
-	    </group>
-	  </group>
-	</else>
+            </group>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="lowercase"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="edition"/>
+            <text macro="publisher"/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <group>
+              <label variable="page" form="short"/>
+              <text variable="page" prefix=" "/>
+            </group>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <group delimiter=" ">
+              <text term="in"/>
+              <names variable="editor translator" delimiter=", ">
+                <name sort-separator=", "/>
+                <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
+              </names>
+              <text variable="container-title" font-style="italic"/>
+            </group>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="lowercase"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="edition"/>
+            <text macro="publisher"/>
+            <group>
+              <date variable="issued">
+                <date-part name="year"/>
+              </date>
+              <text variable="collection-title" prefix=" (" suffix=")"/>
+            </group>
+            <group>
+              <label variable="page" form="short"/>
+              <text variable="page" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="lowercase"/>
+              <text variable="volume"/>
+            </group>
+            <group delimiter=" ">
+              <text term="issue" form="short" text-case="lowercase"/>
+              <text variable="issue"/>
+            </group>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="edition"/>
+            <group delimiter=" ">
+              <text macro="publisher"/>
+              <text variable="collection-title" prefix="(" suffix=")"/>
+            </group>
+            <group>
+              <label variable="page" form="short" strip-periods="true"/>
+              <text variable="page" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text macro="editor-translator"/>
+            <text variable="container-title" font-style="italic"/>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="lowercase"/>
+              <text variable="volume"/>
+            </group>
+            <group>
+              <text term="issue" form="short" text-case="lowercase"/>
+              <text variable="issue"/>
+            </group>
+            <group>
+              <label variable="page" form="short" strip-periods="true"/>
+              <text variable="page" prefix=" "/>
+            </group>
+          </group>
+        </else>
       </choose>
       <text prefix=", " macro="access"/>
     </layout>
   </bibliography>
-</style>
\ No newline at end of file
+</style>
diff --git a/universite-de-liege-histoire.csl b/universite-de-liege-histoire.csl
index ddef72510c..c658a97f5d 100644
--- a/universite-de-liege-histoire.csl
+++ b/universite-de-liege-histoire.csl
@@ -7,18 +7,19 @@
       <email>pfpirlet@ulg.ac.be</email>
     </author>
     <id>http://www.zotero.org/styles/universite-de-liege-histoire</id>
-    <link href="http://www.zotero.org/styles/universite-de-liege-histoire" rel="self" />
-    <category field="social_science" />
-    <category citation-format="note" />
+    <link href="http://www.zotero.org/styles/universite-de-liege-histoire" rel="self"/>
+    <category field="social_science"/>
+    <category citation-format="note"/>
     <updated>2011-06-15T08:00:01+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
   </info>
   <locale xml:lang="fr">
     <terms>
-      <term name="ordinal-01">&#232;re</term>
+      <term name="ordinal-01">ère</term>
       <term name="ordinal-02">e</term>
       <term name="ordinal-03">e</term>
       <term name="ordinal-04">e</term>
-      <term name="cited">op.&#160;cit.</term>
+      <term name="cited">op. cit.</term>
       <term name="page" form="short">
         <single>p.</single>
         <multiple>p.</multiple>
@@ -29,42 +30,40 @@
       </term>
     </terms>
   </locale>
-
   <macro name="author">
     <choose>
       <if variable="author">
         <names variable="author">
           <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" font-variant="small-caps" />
+            <name-part name="family" font-variant="small-caps"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
           <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" font-variant="small-caps" />
+            <name-part name="family" font-variant="small-caps"/>
           </name>
-          <label form="short" prefix="&#160;(" suffix=".)"/>
+          <label form="short" prefix=" (" suffix=".)"/>
         </names>
       </else-if>
     </choose>
   </macro>
-
   <macro name="author-bib">
     <choose>
       <if variable="author">
         <names variable="author">
           <name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" font-variant="small-caps" />
+            <name-part name="family" font-variant="small-caps"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
           <name name-as-sort-order="all" form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-            <name-part name="family" font-variant="small-caps" />
+            <name-part name="family" font-variant="small-caps"/>
           </name>
-          <label form="short" prefix="&#160;(" suffix=".)"/>
+          <label form="short" prefix=" (" suffix=".)"/>
         </names>
       </else-if>
     </choose>
@@ -72,76 +71,75 @@
   <macro name="editor">
     <names variable="editor">
       <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
-        <name-part name="family" font-variant="small-caps" />
+        <name-part name="family" font-variant="small-caps"/>
       </name>
-      <label form="short" prefix="&#160;(" suffix=".)"/>
+      <label form="short" prefix=" (" suffix=".)"/>
     </names>
   </macro>
   <macro name="translator">
     <names variable="translator">
       <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal" prefix=" traduit par ">
-        <name-part name="family" font-variant="small-caps" />
+        <name-part name="family" font-variant="small-caps"/>
       </name>
     </names>
   </macro>
   <macro name="title">
     <choose>
       <if type="bill book graphic legal_case motion_picture report song" match="any">
-        <text variable="title" text-case="capitalize-first" font-style="italic" />
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="&#171;&#160;" suffix="&#160;&#187;, " font-style="normal" />
-          <text value="in " font-style="normal" />
-          <text variable="container-title" font-style="italic" />
+          <text variable="title" text-case="capitalize-first" prefix="« " suffix=" », " font-style="normal"/>
+          <text value="in " font-style="normal"/>
+          <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
       <else-if type="thesis" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" font-style="italic" suffix="," />
-          <text variable="genre" suffix=", " prefix=" " />
-          <text variable="publisher" />
+          <text variable="title" text-case="capitalize-first" font-style="italic" suffix=","/>
+          <text variable="genre" suffix=", " prefix=" "/>
+          <text variable="publisher"/>
         </group>
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" font-style="italic" />
+          <text variable="title" text-case="capitalize-first" font-style="italic"/>
           <text variable="archive" prefix=" "/>
-          <text variable="archive_location" prefix=" " />
-          <text variable="call-number" prefix=" " />
+          <text variable="archive_location" prefix=" "/>
+          <text variable="call-number" prefix=" "/>
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="&#171;&#160;" suffix="&#160;&#187;," />
-          <text value="in" font-style="normal" suffix=" " prefix=" " />
+          <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »,"/>
+          <text value="in" font-style="normal" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
-          <text variable="container-title" text-case="capitalize-first" font-style="italic" />
+          <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
         </group>
       </else-if>
       <else-if type="webpage" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", " />
-          <text variable="URL" text-decoration="underline" />
+          <text variable="title" text-case="capitalize-first" font-style="italic" suffix=", "/>
+          <text variable="URL" text-decoration="underline"/>
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
+        <text variable="title" prefix="« " suffix=" »"/>
       </else>
-
     </choose>
   </macro>
   <macro name="pub-place">
     <choose>
       <if type="bill book chapter entry-dictionary entry-encyclopedia thesis graphic legal_case manuscript motion_picture paper-conference report song" match="any">
-        <text variable="publisher-place" />
+        <text variable="publisher-place"/>
       </if>
     </choose>
   </macro>
   <macro name="publisher">
     <choose>
       <if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case motion_picture paper-conference report song" match="any">
-        <text variable="publisher" />
+        <text variable="publisher"/>
       </if>
     </choose>
   </macro>
@@ -149,30 +147,27 @@
     <choose>
       <if type="bill book graphic legal_case motion_picture paper-conference manuscript report song thesis" match="any">
         <group delimiter=", " font-style="normal">
-	
           <group>
             <text term="volume" form="short" suffix="."/>
             <text variable="number-of-volumes" prefix=". " suffix="/"/>
             <text variable="volume"/>
           </group>
           <date variable="issued">
-            <date-part name="year" />
+            <date-part name="year"/>
           </date>
           <choose>
             <if variable="locator" match="any">
-              <text variable="locator" prefix="p.&#160;" />
+              <text variable="locator" prefix="p. "/>
             </if>
             <else-if variable="locator" match="none">
-	
             </else-if>
           </choose>
         </group>
       </if>
-
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=" " font-style="normal">
           <date variable="issued">
-            <date-part name="year" suffix=", " />
+            <date-part name="year" suffix=", "/>
           </date>
           <group>
             <text term="volume" form="short" suffix="."/>
@@ -181,10 +176,10 @@
           </group>
           <choose>
             <if variable="locator" match="any">
-              <text variable="locator" prefix="p.&#160;" />
+              <text variable="locator" prefix="p. "/>
             </if>
             <else-if variable="locator" match="none">
-              <label variable="page" form="short" />
+              <label variable="page" form="short"/>
               <text variable="page"/>
             </else-if>
           </choose>
@@ -194,10 +189,10 @@
         <group delimiter=" " font-style="normal">
           <choose>
             <if variable="locator" match="any">
-              <text variable="locator" prefix="p.&#160;" />
+              <text variable="locator" prefix="p. "/>
             </if>
             <else-if variable="locator" match="none">
-              <label variable="page" form="short" />
+              <label variable="page" form="short"/>
               <text variable="page"/>
             </else-if>
           </choose>
@@ -205,28 +200,27 @@
       </else-if>
       <else-if type="article-newspaper article-magazine" match="any">
         <group delimiter=" " font-style="normal">
-	
-          <label variable="page" form="short" />
-          <text variable="page" />
+          <label variable="page" form="short"/>
+          <text variable="page"/>
         </group>
         <group delimiter=" " font-style="normal">
           <choose>
             <if variable="locator" match="any">
-              <text variable="locator" prefix="p.&#160;" />
+              <text variable="locator" prefix="p. "/>
             </if>
             <else-if variable="locator" match="none">
-              <label variable="page" form="short" />
+              <label variable="page" form="short"/>
             </else-if>
           </choose>
         </group>
       </else-if>
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
-          <text value="consult&#233; le" suffix=" " prefix=" " />
+          <text value="consulté le" suffix=" " prefix=" "/>
           <date variable="accessed" form="text" suffix="">
-            <date-part name="day" />
-            <date-part name="month" />
-            <date-part name="year" />
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
           </date>
         </group>
       </else-if>
@@ -243,9 +237,8 @@
               <text variable="volume"/>
             </group>
             <date variable="issued">
-              <date-part name="year" />
+              <date-part name="year"/>
             </date>
-	
           </group>
           <group>
             <label variable="locator" form="short"/>
@@ -256,7 +249,7 @@
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter=", " font-style="normal">
           <date variable="issued">
-            <date-part name="year" />
+            <date-part name="year"/>
           </date>
           <group>
             <text term="volume" form="short" suffix="."/>
@@ -264,31 +257,30 @@
             <text variable="volume"/>
           </group>
           <group>
-            <label variable="page" form="short" />
-            <text variable="page" prefix="&#160;"/>
+            <label variable="page" form="short"/>
+            <text variable="page" prefix=" "/>
           </group>
         </group>
       </else-if>
       <else-if type="article-journal chapter" match="any">
         <group delimiter=" " font-style="normal">
-          <label variable="page" form="short" />
+          <label variable="page" form="short"/>
           <text variable="page"/>
         </group>
       </else-if>
       <else-if type="article-newspaper article-magazine" match="any">
         <group delimiter=" " font-style="normal">
-	
-          <label variable="page" form="short" />
-          <text variable="page" />
+          <label variable="page" form="short"/>
+          <text variable="page"/>
         </group>
       </else-if>
       <else-if type="webpage" match="any">
         <group delimiter=" " font-style="normal">
-          <text value="consulté le" suffix=" " prefix=" " />
+          <text value="consulté le" suffix=" " prefix=" "/>
           <date variable="accessed" form="text" suffix="">
-            <date-part name="day" />
-            <date-part name="month" />
-            <date-part name="year" />
+            <date-part name="day"/>
+            <date-part name="month"/>
+            <date-part name="year"/>
           </date>
         </group>
       </else-if>
@@ -300,19 +292,18 @@
         <choose>
           <if is-numeric="edition">
             <group delimiter=" ">
-              <number variable="edition" form="ordinal" />
-              <text term="edition" form="short" suffix="." strip-periods="true" />
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" suffix="." strip-periods="true"/>
             </group>
           </if>
           <else>
-            <text variable="edition" text-case="capitalize-first" suffix="." />
+            <text variable="edition" text-case="capitalize-first" suffix="."/>
           </else>
         </choose>
       </if>
       <else-if type="article-journal article-magazine">
         <group delimiter="" font-style="normal">
-	
-          <text macro="volume" />
+          <text macro="volume"/>
           <choose>
             <if variable="issued">
               <date variable="issued" prefix=" (">
@@ -320,7 +311,6 @@
                 <date-part name="month" suffix=" "/>
                 <date-part name="year" suffix=")"/>
               </date>
-	
             </if>
             <else>
               <text macro="volume" text-case="capitalize-first"/>
@@ -334,7 +324,7 @@
   <macro name="volume">
     <choose>
       <if is-numeric="volume">
-        <text term="volume" form="short" suffix=".&#160;"/>
+        <text term="volume" form="short" suffix=". "/>
         <text variable="volume"/>
       </if>
       <else>
@@ -345,7 +335,7 @@
   <macro name="issue">
     <choose>
       <if is-numeric="issue">
-        <text term="issue" form="short" suffix="&#160;"/>
+        <text term="issue" form="short" suffix=" "/>
         <text variable="issue"/>
       </if>
       <else>
@@ -356,17 +346,16 @@
   <macro name="collection">
     <choose>
       <if is-numeric="collection-number">
-        <text variable="collection-title" prefix=" coll.&#160;&#171;&#160;" suffix="&#160;&#187;"/>
-        <text variable="collection-number" prefix=", n&#730;&#160;"/>
+        <text variable="collection-title" prefix=" coll. « " suffix=" »"/>
+        <text variable="collection-number" prefix=", n˚ "/>
       </if>
       <else>
-        <text variable="collection-title" prefix=" coll.&#160;&#171;&#160;" suffix="&#160;&#187;"/>
+        <text variable="collection-title" prefix=" coll. « " suffix=" »"/>
       </else>
     </choose>
   </macro>
-
   <citation>
-    <layout prefix="" suffix="." delimiter="&#160;; ">
+    <layout prefix="" suffix="." delimiter=" ; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -375,32 +364,32 @@
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" text-case="capitalize-first" font-style="italic" />
+          <text term="ibid" text-case="capitalize-first" font-style="italic"/>
         </else-if>
         <else-if position="subsequent">
           <group delimiter=", ">
-            <text macro="author" />
+            <text macro="author"/>
             <choose>
               <if type="bill book graphic legal_case motion_picture report song thesis" match="any">
                 <text variable="title" form="short" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="&#171;&#160;" suffix="&#160;&#187;" font-style="normal" />
+                <text variable="title" text-case="capitalize-first" form="short" prefix="« " suffix=" »" font-style="normal"/>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>
-            <text variable="locator" prefix="p.&#160;"/>
+            <text variable="locator" prefix="p. "/>
           </group>
         </else-if>
         <else>
           <group delimiter=", ">
-            <text macro="author" />
-            <text macro="title" />
-            <text macro="translator" />
-            <text macro="edition" />
-            <text macro="pub-place" />
-            <text macro="publisher" />
-            <text macro="yearpage" />
+            <text macro="author"/>
+            <text macro="title"/>
+            <text macro="translator"/>
+            <text macro="edition"/>
+            <text macro="pub-place"/>
+            <text macro="publisher"/>
+            <text macro="yearpage"/>
           </group>
         </else>
       </choose>
@@ -413,13 +402,13 @@
     </sort>
     <layout prefix="" suffix=".">
       <group delimiter=", ">
-        <text macro="author-bib" />
-        <text macro="title" />
-        <text macro="translator" />
-        <text macro="edition" />
-        <text macro="pub-place" />
-        <text macro="publisher" />
-        <text macro="yearpage-bib" />
+        <text macro="author-bib"/>
+        <text macro="title"/>
+        <text macro="translator"/>
+        <text macro="edition"/>
+        <text macro="pub-place"/>
+        <text macro="publisher"/>
+        <text macro="yearpage-bib"/>
       </group>
     </layout>
   </bibliography>
diff --git a/vienna-legal.csl b/vienna-legal.csl
index 27bf8a5a66..dca14968fd 100644
--- a/vienna-legal.csl
+++ b/vienna-legal.csl
@@ -1,402 +1,415 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" class="note" default-locale="sp" version="1.0" demote-non-dropping-particle="sort-only">
-   <info>
-      <title>Vienna Legal</title>
-      <id>http://www.zotero.org/styles/vienna-legal</id>
-      <link href="http://www.zotero.org/styles/vienna-legal" rel="self"/>
-      <author>
-         <name>Pedro Herrera based on Romanian Humanities by Nicolae Turcan</name>
-         <email>pedro.m.herrera@gmail.com</email>
-      </author>
-      <contributor>
-         <name>Richard Karnesky</name>
-         <email>karnesky+zotero@gmail.com</email>
-         <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
-      </contributor>
-      <category field="humanities"/>
-      <category field="generic-base"/>
-      <category citation-format="author-date"/>
-      <updated>2008-01-14T08:50:29+00:00</updated>
-   </info>
-   <macro name="editor-translator">
-      <names variable="editor translator" delimiter=", ">
-         <label form="verb"/>
-         <name and="text" delimiter=", " prefix=" " delimiter-precedes-last="never"/>
-      </names>
-   </macro>
-   <macro name="author">
-      <names variable="author">
-         <name form="short" delimiter="/" delimiter-precedes-last="always" sort-separator=", "/>
-         <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="title"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="author-bibliography">
-      <names variable="author">
-         <name name-as-sort-order="all" form="short" delimiter="/" delimiter-precedes-last="always" sort-separator=",."/>
-         <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
-         <substitute>
-            <names variable="editor"/>
-            <names variable="translator"/>
-            <text macro="title"/>
-         </substitute>
-      </names>
-   </macro>
-   <macro name="access">
+  <info>
+    <title>Vienna Legal</title>
+    <id>http://www.zotero.org/styles/vienna-legal</id>
+    <link href="http://www.zotero.org/styles/vienna-legal" rel="self"/>
+    <author>
+      <name>Pedro Herrera based on Romanian Humanities by Nicolae Turcan</name>
+      <email>pedro.m.herrera@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Richard Karnesky</name>
+      <email>karnesky+zotero@gmail.com</email>
+      <uri>http://arc.nucapt.northwestern.edu/Richard_Karnesky</uri>
+    </contributor>
+    <category field="humanities"/>
+    <category field="generic-base"/>
+    <category citation-format="author-date"/>
+    <updated>2008-01-14T08:50:29+00:00</updated>
+    <rights>This work is licensed under a Creative Commons Attribution-Share Alike 3.0 License: http://creativecommons.org/licenses/by-sa/3.0/</rights>
+  </info>
+  <macro name="editor-translator">
+    <names variable="editor translator" delimiter=", ">
+      <label form="verb"/>
+      <name and="text" delimiter=", " prefix=" " delimiter-precedes-last="never"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name form="short" delimiter="/" delimiter-precedes-last="always" sort-separator=", "/>
+      <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-bibliography">
+    <names variable="author">
+      <name name-as-sort-order="all" form="short" delimiter="/" delimiter-precedes-last="always" sort-separator=",."/>
+      <label form="short" prefix=" (" suffix=".)" strip-periods="true"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text term="accessed" suffix=" "/>
+      <date variable="accessed" suffix=", ">
+        <date-part name="day" suffix=" "/>
+        <date-part name="month" suffix=" " text-case="lowercase"/>
+        <date-part name="year"/>
+      </date>
       <group>
-         <text term="accessed" suffix=" "/>
-         <date variable="accessed" suffix=", ">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" suffix=" " text-case="lowercase"/>
-            <date-part name="year"/>
-         </date>
-         <group>
-            <text term="at" suffix=" "/>
-            <text variable="URL"/>
-         </group>
+        <text term="at" suffix=" "/>
+        <text variable="URL"/>
       </group>
-   </macro>
-   <macro name="title">
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" text-case="capitalize-first" suffix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="bill book graphic legal_case motion_picture report song" match="any">
+        <text variable="title" text-case="capitalize-first" font-style="italic" form="short"/>
+      </if>
+      <else>
+        <text variable="title" text-case="capitalize-first" prefix=" " form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" collapse="year">
+    <sort>
+      <key macro="author"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
       <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" text-case="capitalize-first" font-style="italic"/>
-         </if>
-         <else>
-            <text variable="title" text-case="capitalize-first" suffix=", "/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="title-short">
-      <choose>
-         <if type="bill book graphic legal_case motion_picture report song" match="any">
-            <text variable="title" text-case="capitalize-first" font-style="italic" form="short"/>
-         </if>
-         <else>
-            <text variable="title" text-case="capitalize-first" prefix=" " form="short"/>
-         </else>
-      </choose>
-   </macro>
-   <macro name="publisher">
-      <group delimiter=", ">
-         <text variable="publisher"/>
-         <text variable="publisher-place"/>
-      </group>
-   </macro>
-   <citation et-al-min="6" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" collapse="year">
-      <sort>
-         <key macro="author"/>
-         <key variable="issued"/>
-      </sort>
-      <layout suffix=".">
-         <choose>
-            <if position="first">
-               <choose>
-                  <if type="bill book graphic legal_case motion_picture report song" match="any">
-                     <group delimiter=" ">
-                        <text macro="author" suffix=","/>
-                        <group delimiter=" ">
-                           <text macro="title"/><!-- Here will be the original-date, when zotero will have an ui field for it.
+        <if position="first">
+          <choose>
+            <if type="bill book graphic legal_case motion_picture report song" match="any">
+              <group delimiter=" ">
+                <text macro="author" suffix=","/>
+                <group delimiter=" ">
+                  <text macro="title"/>
+                  <!-- Here will be the original-date, when zotero will have an ui field for it.
                                         <date variable="original-date" prefix="(" suffix=")">
                                         <date-part name="year"/>
                                         </date>
                                     -->
-                        </group>
-                        <group delimiter=" ">
-                           <text term="volume" form="short" text-case="lowercase"/>
-                           <text variable="volume"/>
-                        </group>
-                        <text variable="edition"/><!-- text macro="publisher"/-->
-                        <date variable="issued">
-                           <date-part name="year" prefix="(" suffix=")"/>
-                        </date>
-                        <group>
-                           <label variable="locator" form="short"/>
-                           <text variable="locator" prefix=" "/>
-                        </group>
-                        <text macro="access"/>
-                     </group>
-                  </if>
-                  <else-if type="chapter paper-conference" match="any">
-                     <group delimiter=" ">
-                        <text macro="author" suffix=","/>
-                        <text macro="title" suffix=","/>
-                        <group delimiter=" ">
-                           <text term="in"/>
-                           <names variable="editor translator" delimiter=", ">
-                              <name sort-separator=","/>
-                              <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
-                           </names>
-                           <text variable="container-title" font-style="italic"/>
-                        </group>
-                        <group delimiter=" ">
-                           <text term="volume" form="short" text-case="lowercase"/>
-                           <text variable="volume"/>
-                        </group>
-                        <text variable="edition"/><!--text macro="publisher"/-->
-                        <group>
-                           <date variable="issued">
-                              <date-part name="year" prefix="(" suffix=")"/>
-                           </date>
-                           <text variable="collection-title" prefix=" (" suffix=")"/>
-                        </group><!--group>
-                  <label variable="locator" include-period="true" form="short"/>
+                </group>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="edition"/>
+                <!-- text macro="publisher"/-->
+                <date variable="issued">
+                  <date-part name="year" prefix="(" suffix=")"/>
+                </date>
+                <group>
+                  <label variable="locator" form="short"/>
                   <text variable="locator" prefix=" "/>
-                </group-->
-                        <text macro="access"/>
-                     </group>
-                  </else-if>
-                  <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-                     <group delimiter=" ">
-                        <text macro="author" suffix=", "/>
-                        <text macro="title"/>
-                        <text variable="container-title" font-style="italic"/>
-                        <group delimiter=" ">
-                           <text term="volume" form="short" text-case="lowercase"/>
-                           <text variable="volume"/>
-                        </group>
-                        <text variable="issue"/>
-                        <date variable="issued">
-                           <date-part name="year"/>
-                        </date>
-                        <text macro="editor-translator"/>
-                        <text variable="edition"/>
-                        <group delimiter=" ">
-                           <text macro="publisher"/>
-                           <text variable="collection-title" prefix=" (" suffix=")"/>
-                        </group>
-                        <group>
-                           <label variable="locator" form="short"/>
-                           <text variable="locator" prefix=" "/>
-                        </group>
-                        <text macro="access"/>
-                     </group>
-                  </else-if>
-                  <else>
-                     <group delimiter=", ">
-                        <text macro="author"/>
-                        <text macro="title"/>
-                        <text macro="editor-translator"/>
-                        <group delimiter=", ">
-                           <text variable="container-title" font-style="italic"/>
-                           <group delimiter=" ">
-                              <text term="volume" form="short" text-case="lowercase"/>
-                              <text variable="volume"/>
-                           </group>
-                           <text variable="issue"/>
-                        </group>
-                        <group>
-                           <label variable="locator" form="short"/>
-                           <text variable="locator" prefix=" "/>
-                        </group>
-                     </group>
-                  </else>
-               </choose>
+                </group>
+                <text macro="access"/>
+              </group>
             </if>
-            <else-if position="ibid-with-locator">
-               <group delimiter=", ">
-                  <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
-                  <group>
-                     <label variable="locator" form="short"/>
-                     <text variable="locator" prefix=" "/>
-                  </group>
-               </group>
-            </else-if>
-            <else-if position="ibid">
-               <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
-            </else-if>
-            <else-if position="subsequent">
-               <choose>
-                  <if type="bill book graphic legal_case motion_picture report song" match="any">
-                     <group delimiter=", ">
-                        <text macro="author"/>
-                        <text macro="title-short"/>
-                        <group delimiter=" ">
-                           <text term="volume" form="short" text-case="lowercase"/>
-                           <text variable="volume"/>
-                        </group>
-                        <group>
-                           <label variable="locator" form="short"/>
-                           <text variable="locator" prefix=" "/>
-                        </group>
-                     </group>
-                  </if>
-                  <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-                     <group delimiter=" ">
-                        <text macro="author" suffix=", "/><!--text macro="title"/-->
-                        <text variable="container-title" font-style="italic"/>
-                        <group delimiter=" ">
-                           <text term="volume" form="short" text-case="lowercase"/>
-                           <text variable="volume"/>
-                        </group>
-                        <text variable="issue"/>
-                        <date variable="issued">
-                           <date-part name="year"/>
-                        </date>
-                        <text macro="editor-translator"/>
-                        <text variable="edition"/>
-                        <group delimiter=" ">
-                           <text macro="publisher"/>
-                           <text variable="collection-title" prefix=" (" suffix=")"/>
-                        </group>
-                        <group>
-                           <label variable="locator" form="short"/>
-                           <text variable="locator" prefix=" "/>
-                        </group>
-                        <text macro="access"/>
-                     </group>
-                  </else-if>
-                  <else-if type="chapter paper-conference" match="any">
-                     <group delimiter=" ">
-                        <text macro="author" suffix=","/>
-                        <text macro="title" suffix=","/>
-                        <group delimiter=" ">
-                           <text term="in"/>
-                           <names variable="editor translator" delimiter=", ">
-                              <name sort-separator=","/>
-                              <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
-                           </names>
-                           <text variable="container-title" font-style="italic"/>
-                        </group>
-                        <group delimiter=" ">
-                           <text term="volume" form="short" text-case="lowercase"/>
-                           <text variable="volume"/>
-                        </group>
-                        <text variable="edition"/><!--text macro="publisher"/--><!--group>
+            <else-if type="chapter paper-conference" match="any">
+              <group delimiter=" ">
+                <text macro="author" suffix=","/>
+                <text macro="title" suffix=","/>
+                <group delimiter=" ">
+                  <text term="in"/>
+                  <names variable="editor translator" delimiter=", ">
+                    <name sort-separator=","/>
+                    <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
+                  </names>
+                  <text variable="container-title" font-style="italic"/>
+                </group>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="edition"/>
+                <!--text macro="publisher"/-->
+                <group>
                   <date variable="issued">
                     <date-part name="year" prefix="(" suffix=")"/>
                   </date>
                   <text variable="collection-title" prefix=" (" suffix=")"/>
-                </group--><!--group>
+                </group>
+                <!--group>
                   <label variable="locator" include-period="true" form="short"/>
                   <text variable="locator" prefix=" "/>
                 </group-->
-                        <text macro="access"/>
-                     </group>
-                  </else-if>
-                  <else>
-                     <group delimiter=", ">
-                        <text macro="author"/>
-                        <text macro="title-short"/>
-                        <group>
-                           <label variable="locator" form="short"/>
-                           <text variable="locator" prefix=" "/>
-                        </group>
-                     </group>
-                  </else>
-               </choose>
+                <text macro="access"/>
+              </group>
             </else-if>
-         </choose>
-      </layout>
-   </citation>
-   <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6">
-      <sort>
-         <key macro="author-bibliography"/>
-         <key variable="title"/>
-      </sort>
-      <layout suffix=".">
-         <text macro="author-bibliography" suffix=", "/>
-         <choose>
-            <if type="bill book graphic legal_case motion_picture report song" match="any">
-               <group delimiter=" ">
-                  <group delimiter=" ">
-                     <text macro="title"/><!-- Here will be the original-date, when zotero will have an ui field for it.
-                                        <date variable="original-date" prefix="(" suffix=")">
-                                        <date-part name="year"/>
-                                        </date>
-                                    -->
-                  </group>
-                  <group delimiter=" ">
-                     <text term="volume" form="short" text-case="lowercase"/>
-                     <text variable="volume"/>
-                  </group>
-                  <text variable="edition"/><!-- text macro="publisher"/-->
-                  <date variable="issued">
-                     <date-part name="year" prefix="(" suffix=")"/>
-                  </date>
-                  <group>
-                     <label variable="locator" form="short"/>
-                     <text variable="locator" prefix=" "/>
-                  </group>
-                  <text macro="access"/>
-               </group>
-            </if>
-            <else-if type="chapter paper-conference" match="any">
-               <group delimiter=" ">
-                  <text macro="title" suffix=","/>
-                  <group delimiter=" ">
-                     <text term="in"/>
-                     <names variable="editor translator" delimiter=", ">
-                        <name sort-separator=","/>
-                        <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
-                     </names>
-                     <text variable="container-title" font-style="italic"/>
-                  </group>
-                  <group delimiter=" ">
-                     <text term="volume" form="short" text-case="lowercase"/>
-                     <text variable="volume"/>
-                  </group>
-                  <text variable="edition"/><!--text macro="publisher"/-->
-                  <group>
-                     <date variable="issued">
-                        <date-part name="year" prefix="(" suffix=")"/>
-                     </date>
-                     <text variable="collection-title" prefix=" (" suffix=")"/>
-                  </group><!--group>
-                  <label variable="locator" include-period="true" form="short"/>
+            <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+              <group delimiter=" ">
+                <text macro="author" suffix=", "/>
+                <text macro="title"/>
+                <text variable="container-title" font-style="italic"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="issue"/>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text macro="editor-translator"/>
+                <text variable="edition"/>
+                <group delimiter=" ">
+                  <text macro="publisher"/>
+                  <text variable="collection-title" prefix=" (" suffix=")"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
                   <text variable="locator" prefix=" "/>
-                </group-->
-                  <text macro="access"/>
-               </group>
+                </group>
+                <text macro="access"/>
+              </group>
             </else-if>
-            <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-               <group delimiter=" ">
-                  <text macro="title"/>
+            <else>
+              <group delimiter=", ">
+                <text macro="author"/>
+                <text macro="title"/>
+                <text macro="editor-translator"/>
+                <group delimiter=", ">
                   <text variable="container-title" font-style="italic"/>
                   <group delimiter=" ">
-                     <text term="volume" form="short" text-case="lowercase"/>
-                     <text variable="volume"/>
+                    <text term="volume" form="short" text-case="lowercase"/>
+                    <text variable="volume"/>
                   </group>
                   <text variable="issue"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else-if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+            <group>
+              <label variable="locator" form="short"/>
+              <text variable="locator" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if position="ibid">
+          <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+        </else-if>
+        <else-if position="subsequent">
+          <choose>
+            <if type="bill book graphic legal_case motion_picture report song" match="any">
+              <group delimiter=", ">
+                <text macro="author"/>
+                <text macro="title-short"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </group>
+            </if>
+            <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+              <group delimiter=" ">
+                <text macro="author" suffix=", "/>
+                <!--text macro="title"/-->
+                <text variable="container-title" font-style="italic"/>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="issue"/>
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text macro="editor-translator"/>
+                <text variable="edition"/>
+                <group delimiter=" ">
+                  <text macro="publisher"/>
+                  <text variable="collection-title" prefix=" (" suffix=")"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+                <text macro="access"/>
+              </group>
+            </else-if>
+            <else-if type="chapter paper-conference" match="any">
+              <group delimiter=" ">
+                <text macro="author" suffix=","/>
+                <text macro="title" suffix=","/>
+                <group delimiter=" ">
+                  <text term="in"/>
+                  <names variable="editor translator" delimiter=", ">
+                    <name sort-separator=","/>
+                    <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
+                  </names>
+                  <text variable="container-title" font-style="italic"/>
+                </group>
+                <group delimiter=" ">
+                  <text term="volume" form="short" text-case="lowercase"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="edition"/>
+                <!--text macro="publisher"/-->
+                <!--group>
                   <date variable="issued">
-                     <date-part name="year"/>
+                    <date-part name="year" prefix="(" suffix=")"/>
                   </date>
-                  <text macro="editor-translator"/>
-                  <text variable="edition"/>
-                  <group delimiter=" ">
-                     <text macro="publisher"/>
-                     <text variable="collection-title" prefix=" (" suffix=")"/>
-                  </group>
-                  <group>
-                     <label variable="locator" form="short"/>
-                     <text variable="locator" prefix=" "/>
-                  </group>
-                  <text macro="access"/>
-               </group>
+                  <text variable="collection-title" prefix=" (" suffix=")"/>
+                </group-->
+                <!--group>
+                  <label variable="locator" include-period="true" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group-->
+                <text macro="access"/>
+              </group>
             </else-if>
             <else>
-               <group delimiter=", ">
-                  <text macro="title"/>
-                  <text macro="editor-translator"/>
-                  <group delimiter=", ">
-                     <text variable="container-title" font-style="italic"/>
-                     <group delimiter=" ">
-                        <text term="volume" form="short" text-case="lowercase"/>
-                        <text variable="volume"/>
-                     </group>
-                     <text variable="issue"/>
-                  </group>
-                  <group>
-                     <label variable="locator" form="short"/>
-                     <text variable="locator" prefix=" "/>
-                  </group>
-               </group>
+              <group delimiter=", ">
+                <text macro="author"/>
+                <text macro="title-short"/>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </group>
             </else>
-         </choose>
-         <text prefix=", " macro="access"/>
-      </layout>
-   </bibliography>
-</style>
\ No newline at end of file
+          </choose>
+        </else-if>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="6" et-al-use-first="6">
+    <sort>
+      <key macro="author-bibliography"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author-bibliography" suffix=", "/>
+      <choose>
+        <if type="bill book graphic legal_case motion_picture report song" match="any">
+          <group delimiter=" ">
+            <group delimiter=" ">
+              <text macro="title"/>
+              <!-- Here will be the original-date, when zotero will have an ui field for it.
+                                        <date variable="original-date" prefix="(" suffix=")">
+                                        <date-part name="year"/>
+                                        </date>
+                                    -->
+            </group>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="lowercase"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="edition"/>
+            <!-- text macro="publisher"/-->
+            <date variable="issued">
+              <date-part name="year" prefix="(" suffix=")"/>
+            </date>
+            <group>
+              <label variable="locator" form="short"/>
+              <text variable="locator" prefix=" "/>
+            </group>
+            <text macro="access"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=" ">
+            <text macro="title" suffix=","/>
+            <group delimiter=" ">
+              <text term="in"/>
+              <names variable="editor translator" delimiter=", ">
+                <name sort-separator=","/>
+                <label form="short" prefix=" (" suffix=".)" text-case="lowercase" strip-periods="true"/>
+              </names>
+              <text variable="container-title" font-style="italic"/>
+            </group>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="lowercase"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="edition"/>
+            <!--text macro="publisher"/-->
+            <group>
+              <date variable="issued">
+                <date-part name="year" prefix="(" suffix=")"/>
+              </date>
+              <text variable="collection-title" prefix=" (" suffix=")"/>
+            </group>
+            <!--group>
+                  <label variable="locator" include-period="true" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group-->
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
+          <group delimiter=" ">
+            <text macro="title"/>
+            <text variable="container-title" font-style="italic"/>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="lowercase"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="issue"/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text macro="editor-translator"/>
+            <text variable="edition"/>
+            <group delimiter=" ">
+              <text macro="publisher"/>
+              <text variable="collection-title" prefix=" (" suffix=")"/>
+            </group>
+            <group>
+              <label variable="locator" form="short"/>
+              <text variable="locator" prefix=" "/>
+            </group>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="title"/>
+            <text macro="editor-translator"/>
+            <group delimiter=", ">
+              <text variable="container-title" font-style="italic"/>
+              <group delimiter=" ">
+                <text term="volume" form="short" text-case="lowercase"/>
+                <text variable="volume"/>
+              </group>
+              <text variable="issue"/>
+            </group>
+            <group>
+              <label variable="locator" form="short"/>
+              <text variable="locator" prefix=" "/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text prefix=", " macro="access"/>
+    </layout>
+  </bibliography>
+</style>