From f55654ca3429b1284386fe9f56f419f6a93441a8 Mon Sep 17 00:00:00 2001
From: Bruce D'Arcus <bdarcus@gmail.com>
Date: Mon, 17 Dec 2007 14:41:08 +0000
Subject: [PATCH] updated style metadata to correspond to schema changes

---
 csl/a251.csl                           | 333 ++++++-----
 csl/aag.csl                            |   2 -
 csl/ama.csl                            | 341 ++++++-----
 csl/anal-chim-acta.csl                 | 221 ++++----
 csl/analytic-chemistry.csl             | 231 ++++----
 csl/antonie-van-leeuwenhoek.csl        | 287 +++++-----
 csl/apsa.csl                           | 323 ++++++-----
 csl/art-history.csl                    |   3 +-
 csl/asa.csl                            | 405 +++++++------
 csl/bioinformatics.csl                 | 275 +++++----
 csl/cell.csl                           | 285 +++++-----
 csl/chicago-author-date.csl            | 390 ++++++-------
 csl/chicago-fullnote-bibliography.csl  |   3 +-
 csl/chicago-note-bibliography.csl      |   3 +-
 csl/chicago-note.csl                   |   3 +-
 csl/cse.csl                            | 333 ++++++-----
 csl/fems.csl                           | 386 ++++++-------
 csl/genesdev.csl                       | 384 ++++++-------
 csl/genomebiology.csl                  | 249 ++++----
 csl/harvard1.csl                       | 328 +++++------
 csl/harvard2.csl                       | 346 +++++------
 csl/harvard3.csl                       | 336 +++++------
 csl/history-theory.csl                 |   3 +-
 csl/ieee.csl                           |   1 -
 csl/inter-ro.csl                       | 665 +++++++++++-----------
 csl/iso690-author-date.csl             | 372 ++++++------
 csl/jbact.csl                          | 163 +++---
 csl/jbc.csl                            | 285 +++++-----
 csl/metabolic-eng.csl                  | 362 ++++++------
 csl/meteoritics.csl                    | 382 ++++++-------
 csl/mhra.csl                           |   3 +-
 csl/mhra_note_without_bibliography.csl |   1 -
 csl/mla.csl                            |   1 -
 csl/nature.csl                         |   1 -
 csl/neuroreport.csl                    | 163 +++---
 csl/nlm.csl                            |   1 -
 csl/nuc-acid-res.csl                   | 239 ++++----
 csl/ou-harvard.csl                     | 366 ++++++------
 csl/oxford-art.csl                     |   3 +-
 csl/plos.csl                           | 241 ++++----
 csl/pnas.csl                           | 237 ++++----
 csl/rna.csl                            | 384 ++++++-------
 csl/ro-humanities.csl                  | 757 ++++++++++++-------------
 csl/royal-society-chemistry.csl        | 241 ++++----
 csl/science.csl                        | 253 ++++-----
 csl/waterresearch.csl                  | 321 ++++++-----
 csl/yeast.csl                          | 366 ++++++------
 47 files changed, 5621 insertions(+), 5657 deletions(-)

diff --git a/csl/a251.csl b/csl/a251.csl
index 3a61a70917..5ffc6c3965 100644
--- a/csl/a251.csl
+++ b/csl/a251.csl
@@ -1,167 +1,166 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>Open University A251 format</title>
-    <id>http://www.zotero.org/styles/ou-a251</id>
-    <link>http://www.zotero.org/styles/ou-a251</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <updated></updated>
-    <summary>Style for the Open University Arts course A251</summary>
-    <category term="author-date"/>
-    <category term="history"/>
-  </info>
-  <macro name="editor">
-    <names variable="editor" prefix="(" suffix=")" delimiter=", ">
-      <name and="text" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
-	    delimiter=", "/>
-      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text macro="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <choose>
-      <if variable="volume" type="book" match="all">
-	<text variable="volume" />
-      </if>
-      <else>
-	<names variable="author">
-	  <name form="short" and="text" delimiter=", " initialize-with=". "/>
-	  <substitute>
-	    <names variable="editor"/>
-	    <names variable="translator"/>
-	    <choose>
-	      <if type="book">
-		<text variable="title" form="short" font-style="italic"/>
-	      </if>
-	      <else>
-		<text variable="title" form="short"/>
-	      </else>
-	    </choose>
-	  </substitute>
-	</names>
-	<date variable="issued" prefix=", ">
-	  <date-part name="year"/>
-	</date>
-
-      </else>
-    </choose>
-  </macro>
-  <macro name="access">
-    <group>
-      <text term="online" prefix="[" 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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<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>
-    <option name="et-al-min" value="2"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="2"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <text macro="author-short"/>
-      <label variable="locator" prefix=", " suffix="." form="short"/>
-      <text variable="locator" prefix=" "/>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="6"/>
-    <sort>
-      <key macro="author"/>
-      <key macro="year-date"/>
-      <key variable="citation-number"/>
-    </sort>
-    <layout>
-      <text macro="author" suffix=" "/>
-      <date variable="issued" prefix=" (" suffix=")">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group suffix=",">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " quotes="true"/>
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="lowercase"/>
-	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
-	      <name and="text" sort-separator=", " initialize-with=". "/>
-	      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-	    </names>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group prefix=", ">
-		<label variable="page" form="short" suffix=". "/>
-		<text variable="page"/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " quotes="true"/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=", ">
-	      <text variable="volume" />
-	      <text variable="issue" prefix="/"/>
-	    </group>
-	    <group prefix=", ">
-	      <label variable="page" form="short" suffix="."/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>Open University A251 format</title>
+    <id>http://www.zotero.org/styles/ou-a251</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <updated></updated>
+    <summary>Style for the Open University Arts course A251</summary>
+    <category term="author-date"/>
+    <category term="history"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" prefix="(" suffix=")" delimiter=", ">
+      <name and="text" initialize-with=". " delimiter=", "/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
+	    delimiter=", "/>
+      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <choose>
+      <if variable="volume" type="book" match="all">
+	<text variable="volume" />
+      </if>
+      <else>
+	<names variable="author">
+	  <name form="short" and="text" delimiter=", " initialize-with=". "/>
+	  <substitute>
+	    <names variable="editor"/>
+	    <names variable="translator"/>
+	    <choose>
+	      <if type="book">
+		<text variable="title" form="short" font-style="italic"/>
+	      </if>
+	      <else>
+		<text variable="title" form="short"/>
+	      </else>
+	    </choose>
+	  </substitute>
+	</names>
+	<date variable="issued" prefix=", ">
+	  <date-part name="year"/>
+	</date>
+
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <group>
+      <text term="online" prefix="[" 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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<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>
+    <option name="et-al-min" value="2"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="2"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <text macro="author-short"/>
+      <label variable="locator" prefix=", " suffix="." form="short"/>
+      <text variable="locator" prefix=" "/>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="6"/>
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="citation-number"/>
+    </sort>
+    <layout>
+      <text macro="author" suffix=" "/>
+      <date variable="issued" prefix=" (" suffix=")">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group suffix=",">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <text prefix=" " suffix="." macro="publisher"/>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " quotes="true"/>
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="lowercase"/>
+	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
+	      <name and="text" sort-separator=", " initialize-with=". "/>
+	      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+	    </names>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group prefix=", ">
+		<label variable="page" form="short" suffix=". "/>
+		<text variable="page"/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" " quotes="true"/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=", ">
+	      <text variable="volume" />
+	      <text variable="issue" prefix="/"/>
+	    </group>
+	    <group prefix=", ">
+	      <label variable="page" form="short" suffix="."/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/aag.csl b/csl/aag.csl
index 472d87de49..99306bc14b 100644
--- a/csl/aag.csl
+++ b/csl/aag.csl
@@ -3,7 +3,6 @@
   <info>
     <title>Annals of the Association of American Geographers</title>
     <id>http://www.zotero.org/styles/aag</id>
-    <link>http://www.zotero.org/styles/aag</link>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
@@ -12,7 +11,6 @@
     <category term="geography"/>
     <updated/>
     <summary>The Annals of the Association of American Geographers style.</summary>
-    <source></source>
   </info>
   <macro name="editor">
     <names variable="editor" prefix="" suffix="" delimiter=", ">
diff --git a/csl/ama.csl b/csl/ama.csl
index 5b760f6bd7..b7a5867156 100644
--- a/csl/ama.csl
+++ b/csl/ama.csl
@@ -1,171 +1,170 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>American Medical Association</title>
-    <id>http://www.zotero.org/syles/ama</id>
-    <link>http://www.zotero.org/syles/ama</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="medicine"/>
-    <updated/>
-    <summary>The American Medical Association style as used in JAMA.</summary>
-    <source>http://www.samford.edu/schools/pharmacy/dic/amaquickref07.pdf</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <group suffix=".">
-      <names variable="author">
-	<name name-as-sort-order="all" sort-separator=" " initialize-with=""
-	      delimiter=", " delimiter-precedes-last="always"/>
-	<label form="short" prefix=" " suffix="" text-case="lowercase"/>
-	<substitute>
-	  <names variable="editor"/>
-	  <text macro="anon"/>
-	</substitute>
-      </names>
-    </group>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with="."/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<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="year-date">
-    <group prefix=" ">
-      <choose>
-	<if variable="issued">
-	  <date variable="issued">
-	    <date-part name="year"/>
-	  </date>
-	</if>
-	<else>
-	  <text term="no date"/>
-	</else>
-      </choose>
-    </group>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout delimiter="," vertical-align="sup">
-      <text variable="citation-number" />
-      <group prefix="(" suffix=")">
-	<label variable="locator" form="short"/>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="false"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="3"/>
-    <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
-      <choose>
-	<if type="book">
-	  <group suffix=".">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text macro="editor" prefix=" (" suffix=")"/>
-	  </group>
-	  <text prefix=" " suffix="" macro="publisher"/>
-	  <group suffix="." prefix="; ">
-	    <date variable="issued">
-	      <date-part name="year"/>
-	    </date>
-	    <text variable="page" prefix=":"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="capitalize-first" suffix=": "/>
-	    <text macro="editor"/>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-	    <text variable="volume" prefix="Vol " suffix="."/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group suffix="." prefix="; ">
-		<date variable="issued">
-		  <date-part name="year"/>
-		</date>
-		<text variable="page" prefix=":"/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic" form="short" suffix="."/>
-	    <group delimiter=";" prefix=" ">
-	      <date variable="issued">
-		<date-part name="year"/>
-	      </date>
-	      <group>
-		<text variable="volume" />
-		<text variable="issue" prefix="(" suffix=")"/>
-	      </group>
-	    </group>
-	    <text variable="page" prefix=":"/>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>American Medical Association</title>
+    <id>http://www.zotero.org/syles/ama</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="medicine"/>
+    <updated/>
+    <summary>The American Medical Association style as used in JAMA.</summary>
+    <link href="http://www.samford.edu/schools/pharmacy/dic/amaquickref07.pdf" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+	<name name-as-sort-order="all" sort-separator=" " initialize-with=""
+	      delimiter=", " delimiter-precedes-last="always"/>
+	<label form="short" prefix=" " suffix="" text-case="lowercase"/>
+	<substitute>
+	  <names variable="editor"/>
+	  <text macro="anon"/>
+	</substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " initialize-with="."/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<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="year-date">
+    <group prefix=" ">
+      <choose>
+	<if variable="issued">
+	  <date variable="issued">
+	    <date-part name="year"/>
+	  </date>
+	</if>
+	<else>
+	  <text term="no date"/>
+	</else>
+      </choose>
+    </group>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number" />
+      <group prefix="(" suffix=")">
+	<label variable="locator" form="short"/>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="false"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="3"/>
+    <layout>
+      <text variable="citation-number" prefix="" suffix=". "/>
+      <text macro="author" suffix=""/>
+      <choose>
+	<if type="book">
+	  <group suffix=".">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" prefix=" " suffix=" ed."/>
+	    <text macro="editor" prefix=" (" suffix=")"/>
+	  </group>
+	  <text prefix=" " suffix="" macro="publisher"/>
+	  <group suffix="." prefix="; ">
+	    <date variable="issued">
+	      <date-part name="year"/>
+	    </date>
+	    <text variable="page" prefix=":"/>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="capitalize-first" suffix=": "/>
+	    <text macro="editor"/>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+	    <text variable="volume" prefix="Vol " suffix="."/>
+	    <text variable="edition" prefix=" " suffix=" ed."/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group suffix="." prefix="; ">
+		<date variable="issued">
+		  <date-part name="year"/>
+		</date>
+		<text variable="page" prefix=":"/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic" form="short" suffix="."/>
+	    <group delimiter=";" prefix=" ">
+	      <date variable="issued">
+		<date-part name="year"/>
+	      </date>
+	      <group>
+		<text variable="volume" />
+		<text variable="issue" prefix="(" suffix=")"/>
+	      </group>
+	    </group>
+	    <text variable="page" prefix=":"/>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/anal-chim-acta.csl b/csl/anal-chim-acta.csl
index 3e089a95c6..6d6709edef 100644
--- a/csl/anal-chim-acta.csl
+++ b/csl/anal-chim-acta.csl
@@ -1,111 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Analytica Chimica Acta</title>
-    <id>http://www.zotero.org/styles/anal-chim-acta</id>
-    <link>http://www.zotero.org/styles/anal-chim-acta</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="chemistry"/>
-    <updated/>
-    <summary>The Analytica Chimica Acta style.</summary>
-    <source>http://www.elsevier.com/framework_products/promis_misc/gfaacapdf352007.pdf</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <name  initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" text-case="capitalize-first" suffix=".)"/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name  initialize-with="."
-	     delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="." text-case="capitalize-first"/>
-      <substitute>
-	<names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <text variable="URL"/>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="volume">
-    <text variable="volume" prefix="vol. "/>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". "/>
-    <text variable="page"/>
-  </macro>
-  <macro name="book-container">
-    <group delimiter=" ">
-      <text term="in" text-case="lowercase" suffix=":"/>
-      <text macro="editor" suffix=","/>
-      <text variable="container-title" />
-    </group>
-  </macro>
-  <macro name="issued">
-    <date variable="issued" delimiter=" ">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout delimiter=", " prefix="[" suffix="]">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography>
-    <layout suffix=".">
-      <text variable="citation-number" prefix="[" suffix="] "/>
-      <text macro="author" suffix=", "/>
-      <choose>
-	<if type="book">
-	  <text macro="title" suffix=", "/>
-	  <group delimiter=", ">
-	    <text variable="edition"/>
-	    <text macro="publisher"/>
-	    <text macro="issued"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <group delimiter=", ">
-	    <text macro="book-container"/>
-	    <text macro="publisher" />
-	    <text macro="issued"/>
-	    <text macro="pages"/>
-	  </group>
-	</else-if>
-	<else>
-	  <group delimiter=", ">
-	    <text variable="container-title" form="short"/>
-	    <group delimiter=" ">
-	      <text variable="volume"/>
-	      <text macro="issued" prefix="(" suffix=")"/>
-	      <text variable="page" />
-	    </group>
-	  </group>
-	</else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Analytica Chimica Acta</title>
+    <id>http://www.zotero.org/styles/anal-chim-acta</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="chemistry"/>
+    <updated/>
+    <summary>The Analytica Chimica Acta style.</summary>
+    <link href="http://www.elsevier.com/framework_products/promis_misc/gfaacapdf352007.pdf" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name  initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" text-case="capitalize-first" suffix=".)"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name  initialize-with="."
+	     delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="capitalize-first"/>
+      <substitute>
+	<names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <text variable="URL"/>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <text variable="volume" prefix="vol. "/>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="book-container">
+    <group delimiter=" ">
+      <text term="in" text-case="lowercase" suffix=":"/>
+      <text macro="editor" suffix=","/>
+      <text variable="container-title" />
+    </group>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout delimiter=", " prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout suffix=".">
+      <text variable="citation-number" prefix="[" suffix="] "/>
+      <text macro="author" suffix=", "/>
+      <choose>
+	<if type="book">
+	  <text macro="title" suffix=", "/>
+	  <group delimiter=", ">
+	    <text variable="edition"/>
+	    <text macro="publisher"/>
+	    <text macro="issued"/>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <group delimiter=", ">
+	    <text macro="book-container"/>
+	    <text macro="publisher" />
+	    <text macro="issued"/>
+	    <text macro="pages"/>
+	  </group>
+	</else-if>
+	<else>
+	  <group delimiter=", ">
+	    <text variable="container-title" form="short"/>
+	    <group delimiter=" ">
+	      <text variable="volume"/>
+	      <text macro="issued" prefix="(" suffix=")"/>
+	      <text variable="page" />
+	    </group>
+	  </group>
+	</else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/analytic-chemistry.csl b/csl/analytic-chemistry.csl
index cb10425df6..df33ebd8b6 100644
--- a/csl/analytic-chemistry.csl
+++ b/csl/analytic-chemistry.csl
@@ -1,116 +1,115 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Analytical Chemistry</title>
-    <id>http://www.zotero.org/styles/analytic-chemistry</id>
-    <link>http://www.zotero.org/styles/analytic-chemistry</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="chemistry"/>
-    <updated/>
-    <summary>The Analytical Chemistry style.</summary>
-    <source>http://pubs.acs.org/paragonplus/submission/ancham/ancham_authguide.pdf</source>
-  </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="."/>
-    </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"/>
-      <substitute>
-	<names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <text variable="URL"/>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="volume">
-    <text variable="volume" prefix="vol. "/>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". "/>
-    <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"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout delimiter=", " >
-      <text variable="citation-number" vertical-align="sup"/>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="second-field-align" value="margin"/>
-    <layout suffix=".">
-      <text variable="citation-number" prefix="(" suffix=") "/>
-      <text macro="author" suffix=" "/>
-      <choose>
-	<if type="book">
-	  <text macro="title" suffix=", "/>
-	  <group delimiter="; ">
-	    <text macro="editor" prefix=" "/>
-	    <text variable="edition"/>
-	    <text macro="publisher"/>
-	    <text macro="issued"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <group delimiter="; ">
-	    <text macro="book-container"/>
-	    <text macro="editor"/>
-	    <group delimiter=", ">
-	      <text macro="publisher" />
-	      <text macro="issued"/>
-	    </group>
-	    <text macro="pages"/>
-	  </group>
-	</else-if>
-	<else>
-	  <group delimiter=" ">
-	    <text variable="container-title" font-style="italic" form="short" suffix="."/>
-	    <group delimiter=", ">
-	      <text macro="issued" font-weight="bold"/>
-	      <text variable="volume" font-style="italic"/>
-	      <text variable="page" />
-	    </group>
-	  </group>
-	</else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Analytical Chemistry</title>
+    <id>http://www.zotero.org/styles/analytic-chemistry</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="chemistry"/>
+    <updated/>
+    <summary>The Analytical Chemistry style.</summary>
+    <link href="http://pubs.acs.org/paragonplus/submission/ancham/ancham_authguide.pdf" 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="."/>
+    </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"/>
+      <substitute>
+	<names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <text variable="URL"/>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <text variable="volume" prefix="vol. "/>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". "/>
+    <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"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout delimiter=", " >
+      <text variable="citation-number" vertical-align="sup"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="second-field-align" value="margin"/>
+    <layout suffix=".">
+      <text variable="citation-number" prefix="(" suffix=") "/>
+      <text macro="author" suffix=" "/>
+      <choose>
+	<if type="book">
+	  <text macro="title" suffix=", "/>
+	  <group delimiter="; ">
+	    <text macro="editor" prefix=" "/>
+	    <text variable="edition"/>
+	    <text macro="publisher"/>
+	    <text macro="issued"/>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <group delimiter="; ">
+	    <text macro="book-container"/>
+	    <text macro="editor"/>
+	    <group delimiter=", ">
+	      <text macro="publisher" />
+	      <text macro="issued"/>
+	    </group>
+	    <text macro="pages"/>
+	  </group>
+	</else-if>
+	<else>
+	  <group delimiter=" ">
+	    <text variable="container-title" font-style="italic" form="short" suffix="."/>
+	    <group delimiter=", ">
+	      <text macro="issued" font-weight="bold"/>
+	      <text variable="volume" font-style="italic"/>
+	      <text variable="page" />
+	    </group>
+	  </group>
+	</else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/antonie-van-leeuwenhoek.csl b/csl/antonie-van-leeuwenhoek.csl
index ccfed7f5f4..7cde68e8fd 100644
--- a/csl/antonie-van-leeuwenhoek.csl
+++ b/csl/antonie-van-leeuwenhoek.csl
@@ -1,144 +1,143 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Antonie van Leeuwenhoek Journal</title>
-    <id>http://www.zotero.org/styles/antonie-van-leeuwenhoek</id>
-    <link>http://www.zotero.org/styles/antonie-van-leeuwenhoek</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="biology"/>
-    <category term="author-date"/>
-    <updated/>
-    <summary>Antonie van Leeuwenhoek
-International Journal of General and Molecular Microbiology.</summary>
-    <source>http://www.springer.com/east/home/life+sci/microbiology?SGWID=5-10037-70-35549341-0%38detailsPage=contentItemPage%38contentItemId=138521%38CIPageCounter=CI_FOR_AUTHORS_AND_EDITORS_PAGE0#anchor4</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
-	     delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text variable="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", "/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", " >
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="1"/>
-    <layout suffix=".">
-      <text macro="author"/>
-      <date variable="issued" prefix=" (" suffix=")">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title"/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	    <text macro="publisher" />
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <group class="container" prefix=" " delimiter=" ">
-	    <text macro="title" suffix="."/>
-	    <text term="in" text-case="capitalize-first" suffix=":"/>
-	    <group delimiter=", ">
-	      <text macro="editor"/>
-	      <text variable="container-title" />
-	      <text variable="collection-title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" edn."/>
-	    </group>
-	  </group>
-	  <group suffix=".">
-	    <text macro="publisher" prefix=" "/>
-	    <group prefix=", ">
-	      <label variable="page" suffix=". " form="short"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" delimiter=":" prefix=" " suffix=".">
-	    <group delimiter=" ">
-	      <text variable="container-title" form="short" />
-	      <text variable="volume" />
-	    </group>
-	    <text variable="page"/>
-	  </group>
-	</else>
-      </choose>
-      <text variable="DOI" prefix=" DOI: "/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Antonie van Leeuwenhoek Journal</title>
+    <id>http://www.zotero.org/styles/antonie-van-leeuwenhoek</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="biology"/>
+    <category term="author-date"/>
+    <updated/>
+    <summary>Antonie van Leeuwenhoek
+International Journal of General and Molecular Microbiology.</summary>
+    <link href="http://www.springer.com/east/home/life+sci/microbiology?SGWID=5-10037-70-35549341-0%38detailsPage=contentItemPage%38contentItemId=138521%38CIPageCounter=CI_FOR_AUTHORS_AND_EDITORS_PAGE0#anchor4" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
+	     delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " >
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="1"/>
+    <layout suffix=".">
+      <text macro="author"/>
+      <date variable="issued" prefix=" (" suffix=")">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group delimiter=" " prefix=" ">
+	    <text macro="title"/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	    <text macro="publisher" />
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <group class="container" prefix=" " delimiter=" ">
+	    <text macro="title" suffix="."/>
+	    <text term="in" text-case="capitalize-first" suffix=":"/>
+	    <group delimiter=", ">
+	      <text macro="editor"/>
+	      <text variable="container-title" />
+	      <text variable="collection-title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" edn."/>
+	    </group>
+	  </group>
+	  <group suffix=".">
+	    <text macro="publisher" prefix=" "/>
+	    <group prefix=", ">
+	      <label variable="page" suffix=". " form="short"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" delimiter=":" prefix=" " suffix=".">
+	    <group delimiter=" ">
+	      <text variable="container-title" form="short" />
+	      <text variable="volume" />
+	    </group>
+	    <text variable="page"/>
+	  </group>
+	</else>
+      </choose>
+      <text variable="DOI" prefix=" DOI: "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/apsa.csl b/csl/apsa.csl
index dae3329510..4954c86b24 100644
--- a/csl/apsa.csl
+++ b/csl/apsa.csl
@@ -1,162 +1,161 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>American Political Science Association</title>
-    <id>http://www.zotero.org/styles/apsa</id>
-    <link>http://www.zotero.org/styles/apsa</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="political_science"/>
-    <updated/>
-    <summary>The American Political Science Association style.</summary>
-    <source>http://www.wisc.edu/writing/Handbook/DocAPSA.html</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <label form="short" text-case="lowercase" suffix=". "/>
-      <name and="text"  delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="first" and="text" sort-separator=", " 
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <substitute>
-	<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"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group delimiter=" ">
-      <text value="Available at:"/>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<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="year-date">
-    <group prefix=" ">
-      <choose>
-	<if variable="issued">
-	  <date variable="issued">
-	    <date-part name="year"/>
-	  </date>
-	</if>
-	<else>
-	  <text term="no date"/>
-	</else>
-      </choose>
-    </group>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <text macro="author" suffix="."/>
-      <date variable="issued" prefix=" " suffix=".">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group prefix=" " delimiter=" ">
-	    <text macro="title" suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix="." quotes="true"/>
-	  <group class="container" prefix=" " delimiter=" ">
-	    <text term="in" text-case="capitalize-first"/>
-	    <text variable="container-title" font-style="italic" suffix=","/>
-	    <text variable="collection-title" suffix=","/>
-	    <text macro="editor" suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group prefix=", ">
-		<text variable="page" prefix="p. "/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group prefix=" " delimiter=" " suffix=".">
-	    <text macro="title" quotes="true"/>
-	    <text macro="editor" />
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=" ">
-	      <text variable="volume" />
-	      <text variable="issue" prefix="(" suffix=")"/>
-	    </group>
-	    <text variable="page" prefix=":"/>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>American Political Science Association</title>
+    <id>http://www.zotero.org/styles/apsa</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="political_science"/>
+    <updated/>
+    <summary>The American Political Science Association style.</summary>
+    <link href="http://www.wisc.edu/writing/Handbook/DocAPSA.html" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="short" text-case="lowercase" suffix=". "/>
+      <name and="text"  delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" sort-separator=", " 
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <substitute>
+	<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"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group delimiter=" ">
+      <text value="Available at:"/>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<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="year-date">
+    <group prefix=" ">
+      <choose>
+	<if variable="issued">
+	  <date variable="issued">
+	    <date-part name="year"/>
+	  </date>
+	</if>
+	<else>
+	  <text term="no date"/>
+	</else>
+      </choose>
+    </group>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <text macro="author" suffix="."/>
+      <date variable="issued" prefix=" " suffix=".">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group prefix=" " delimiter=" ">
+	    <text macro="title" suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	  </group>
+	  <text prefix=" " suffix="." macro="publisher"/>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix="." quotes="true"/>
+	  <group class="container" prefix=" " delimiter=" ">
+	    <text term="in" text-case="capitalize-first"/>
+	    <text variable="container-title" font-style="italic" suffix=","/>
+	    <text variable="collection-title" suffix=","/>
+	    <text macro="editor" suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group prefix=", ">
+		<text variable="page" prefix="p. "/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group prefix=" " delimiter=" " suffix=".">
+	    <text macro="title" quotes="true"/>
+	    <text macro="editor" />
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=" ">
+	      <text variable="volume" />
+	      <text variable="issue" prefix="(" suffix=")"/>
+	    </group>
+	    <text variable="page" prefix=":"/>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/art-history.csl b/csl/art-history.csl
index b2b462ca80..3464b9d64c 100644
--- a/csl/art-history.csl
+++ b/csl/art-history.csl
@@ -2,8 +2,7 @@
   <info>
     <title>Art History Journal</title>
     <id>http://www.zotero.org/styles/art-history</id>
-    <link>http://www.zotero.org/styles/art-history</link>
-    <source>http://www.blackwellpublishing.com/submit.asp?ref=0141-6790</source>
+    <link href="http://www.blackwellpublishing.com/submit.asp?ref=0141-6790" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
diff --git a/csl/asa.csl b/csl/asa.csl
index 4c16e78021..ed71a9d42b 100644
--- a/csl/asa.csl
+++ b/csl/asa.csl
@@ -1,203 +1,202 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>American Sociological Association (Author-Date)</title>
-    <id>http://www.zotero.org/styles/asa</id>
-    <link>http://www.zotero.org/styles/asa</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="sociology"/>
-    <updated/>
-    <summary>The ASA style.</summary>
-    <source>http://www.asanet.org/page.ww?name=Quick+Style+Guide%38section=Sociology+Depts</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="verb" text-case="lowercase" suffix=" "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", "/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title" quotes="true"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " >
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if variable="issued">
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
-      </if>
-      <else>
-	<text term="no date" form="short"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="day-month">
-    <date variable="issued">
-      <date-part name="month"/>
-      <date-part name="day" prefix=" "/>
-    </date>
-    
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". " text-case="capitalize-first"/>
-    <text variable="page"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="3"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=":">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </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" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	    <text variable="page"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="." quotes="true"/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", " suffix=".">
-	      <group delimiter=" ">
-		<text macro="pages"/>
-		<text term="in" text-case="lowercase"/>
-		<text variable="container-title" font-style="italic"/>
-	      </group>
-	      <text variable="volume" prefix="vol. "/>
-	      <text variable="collection-title" font-style="italic"/>
-	      <text macro="editor" prefix=" "/>
-	    </group>
-	    <text macro="publisher" prefix=" "/>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=":">
-	      <text variable="volume" />
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>American Sociological Association (Author-Date)</title>
+    <id>http://www.zotero.org/styles/asa</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="sociology"/>
+    <updated/>
+    <summary>The ASA style.</summary>
+    <link href="http://www.asanet.org/page.ww?name=Quick+Style+Guide%38section=Sociology+Depts" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="verb" text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " >
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+	<date variable="issued">
+	  <date-part name="year"/>
+	</date>
+      </if>
+      <else>
+	<text term="no date" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+    
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". " text-case="capitalize-first"/>
+    <text variable="page"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="3"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=":">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </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" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	    <text variable="page"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="." quotes="true"/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", " suffix=".">
+	      <group delimiter=" ">
+		<text macro="pages"/>
+		<text term="in" text-case="lowercase"/>
+		<text variable="container-title" font-style="italic"/>
+	      </group>
+	      <text variable="volume" prefix="vol. "/>
+	      <text variable="collection-title" font-style="italic"/>
+	      <text macro="editor" prefix=" "/>
+	    </group>
+	    <text macro="publisher" prefix=" "/>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <group delimiter=":">
+	      <text variable="volume" />
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/bioinformatics.csl b/csl/bioinformatics.csl
index 28935d0fd4..b403422b8f 100644
--- a/csl/bioinformatics.csl
+++ b/csl/bioinformatics.csl
@@ -1,138 +1,137 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Bioinformatics Journal</title>
-    <id>http://www.zotero.org/styles/bioinformatics</id>
-    <link>http://www.zotero.org/styles/bioinformatics</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="biology"/>
-    <updated></updated>
-    <summary>The Bioinformatics Journal style.</summary>
-    <source>http://www.oxfordjournals.org/bioinformatics/for_authors/general.html</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=",">
-      <name name-as-sort-order="all" sort-separator="," and="text" initialize-with="." delimiter=", "/>
-      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator="," initialize-with="."
-	    delimiter=", "/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<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"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="3"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="3"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="author"/>
-      <date variable="issued" prefix=" (" suffix=")">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title"/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	    <text macro="publisher" />
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" prefix=" " delimiter=", " suffix=".">
-	    <text term="in" text-case="capitalize-first"/>
-	    <text macro="editor"/>
-	    <text variable="container-title" font-style="italic"/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	  </group>
-	  <group suffix=".">
-	    <text macro="publisher" prefix=" "/>
-	    <group prefix=", ">
-	      <label variable="page" suffix=". " form="short"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" delimiter=", " prefix=" " suffix=".">
-	    <text variable="container-title" form="short" font-style="italic"/>
-	    <text variable="volume" />
-	    <text variable="page"/>
-	  </group>
-	</else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Bioinformatics Journal</title>
+    <id>http://www.zotero.org/styles/bioinformatics</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="biology"/>
+    <updated></updated>
+    <summary>The Bioinformatics Journal style.</summary>
+    <link href="http://www.oxfordjournals.org/bioinformatics/for_authors/general.html" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=",">
+      <name name-as-sort-order="all" sort-separator="," and="text" initialize-with="." delimiter=", "/>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator="," initialize-with="."
+	    delimiter=", "/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<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"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="3"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="3"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <date variable="issued" prefix=" (" suffix=")">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group delimiter=" " prefix=" ">
+	    <text macro="title"/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	    <text macro="publisher" />
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" prefix=" " delimiter=", " suffix=".">
+	    <text term="in" text-case="capitalize-first"/>
+	    <text macro="editor"/>
+	    <text variable="container-title" font-style="italic"/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	  </group>
+	  <group suffix=".">
+	    <text macro="publisher" prefix=" "/>
+	    <group prefix=", ">
+	      <label variable="page" suffix=". " form="short"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" delimiter=", " prefix=" " suffix=".">
+	    <text variable="container-title" form="short" font-style="italic"/>
+	    <text variable="volume" />
+	    <text variable="page"/>
+	  </group>
+	</else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/cell.csl b/csl/cell.csl
index a9f7568973..4f2bca2e9b 100644
--- a/csl/cell.csl
+++ b/csl/cell.csl
@@ -1,143 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Cell Journal</title>
-    <id>http://www.zotero.org/styles/cell</id>
-    <link>http://www.zotero.org/styles/cell</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="biology"/>
-    <updated></updated>
-    <summary>The Cell Journal style.</summary>
-    <source>http://www.cell.com/misc/page?page=authors</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name and="text" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase" 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="always"/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<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"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group prefix="(" delimiter=": " suffix=")">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="2"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="2"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <text macro="author"/>
-      <date variable="issued" prefix=" (" suffix=").">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title"/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	    <text macro="publisher" />
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" prefix=" " delimiter=" ">
-	    <text term="in" text-case="capitalize-first"/>
-	    <text variable="container-title" />
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <text macro="editor"/>
-	  </group>
-	  <group suffix=".">
-	    <text macro="publisher" prefix=" "/>
-	    <group prefix=", ">
-	      <label variable="page" suffix=". " form="short"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" delimiter=", " prefix=" " suffix=".">
-	    <group delimiter=" ">
-	      <text variable="container-title" form="short"/>
-	      <text variable="volume" />
-	    </group>
-	    <text variable="page"/>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" />
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Cell Journal</title>
+    <id>http://www.zotero.org/styles/cell</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="biology"/>
+    <updated></updated>
+    <summary>The Cell Journal style.</summary>
+    <link href="http://www.cell.com/misc/page?page=authors" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="text" initialize-with=". " delimiter=", "/>
+      <label form="short" prefix=", " text-case="lowercase" 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="always"/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<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"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group prefix="(" delimiter=": " suffix=")">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="2"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="2"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author"/>
+      <date variable="issued" prefix=" (" suffix=").">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group delimiter=" " prefix=" ">
+	    <text macro="title"/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	    <text macro="publisher" />
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" prefix=" " delimiter=" ">
+	    <text term="in" text-case="capitalize-first"/>
+	    <text variable="container-title" />
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <text macro="editor"/>
+	  </group>
+	  <group suffix=".">
+	    <text macro="publisher" prefix=" "/>
+	    <group prefix=", ">
+	      <label variable="page" suffix=". " form="short"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" delimiter=", " prefix=" " suffix=".">
+	    <group delimiter=" ">
+	      <text variable="container-title" form="short"/>
+	      <text variable="volume" />
+	    </group>
+	    <text variable="page"/>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" />
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/chicago-author-date.csl b/csl/chicago-author-date.csl
index 92b3b95f7c..c17252ec2c 100644
--- a/csl/chicago-author-date.csl
+++ b/csl/chicago-author-date.csl
@@ -1,195 +1,195 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Chicago Manual of Style (Author-Date format)</title>
-    <id>http://www.zotero.org/styles/chicago-author-date</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="generic-base"/>
-    <updated/>
-    <summary>The author-date variant of the Chicago style</summary>
-    <source>http://www.chicagomanualofstyle.org/tools_citationguide.html</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", "/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " >
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <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>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </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" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", ">
-	      <group delimiter=" ">
-		<text term="in" text-case="capitalize-first"/>
-		<text variable="container-title" font-style="italic"/>
-	      </group>
-	      <text macro="editor" prefix=" "/>
-	      <group delimiter=" ">
-		<text variable="volume" prefix="Vol. " suffix=" of"/>
-		<text variable="collection-title" font-style="italic"/>
-		<text macro="series-editor"/>
-	      </group>
-	      <text variable="page"/>
-	      <text macro="publisher" prefix=" "/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=":">
-	      <group delimiter=", ">
-		<text variable="volume" />
-		<text variable="issue" prefix="no. "/>
-	      </group>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Chicago Manual of Style (Author-Date format)</title>
+    <id>http://www.zotero.org/styles/chicago-author-date</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="generic-base"/>
+    <updated/>
+    <summary>The author-date variant of the Chicago style</summary>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " >
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <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>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </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" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", ">
+	      <group delimiter=" ">
+		<text term="in" text-case="capitalize-first"/>
+		<text variable="container-title" font-style="italic"/>
+	      </group>
+	      <text macro="editor" prefix=" "/>
+	      <group delimiter=" ">
+		<text variable="volume" prefix="Vol. " suffix=" of"/>
+		<text variable="collection-title" font-style="italic"/>
+		<text macro="series-editor"/>
+	      </group>
+	      <text variable="page"/>
+	      <text macro="publisher" prefix=" "/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <group delimiter=":">
+	      <group delimiter=", ">
+		<text variable="volume" />
+		<text variable="issue" prefix="no. "/>
+	      </group>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/chicago-fullnote-bibliography.csl b/csl/chicago-fullnote-bibliography.csl
index a857e06884..3423dca279 100644
--- a/csl/chicago-fullnote-bibliography.csl
+++ b/csl/chicago-fullnote-bibliography.csl
@@ -2,8 +2,7 @@
   <info>
     <title>Chicago Manual of Style (Full Note with Bibliography)</title>
     <id>http://www.zotero.org/styles/chicago-fullnote-bibliography</id>
-    <link>http://www.zotero.org/styles/chicago-fullnote-bibliography</link>
-    <source>http://www.chicagomanualofstyle.org/tools_citationguide.html</source>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index 24a017174a..3ae0962d9c 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -4,8 +4,7 @@
   <info>
     <title>Chicago Manual of Style (Note with Bibliography)</title>
     <id>http://www.zotero.org/styles/chicago-note-bibliography</id>
-    <link>http://www.zotero.org/styles/chicago-note-bibliography</link>
-    <source>http://www.chicagomanualofstyle.org/tools_citationguide.html</source>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index af92c002b0..77d98cf886 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -2,8 +2,7 @@
   <info>
     <title>Chicago Manual of Style (Note without Bibliography)</title>
     <id>http://www.zotero.org/styles/chicago-note</id>
-    <link>http://www.zotero.org/styles/chicago-note</link>
-    <source>http://www.chicagomanualofstyle.org/tools_citationguide.html</source>
+    <link href="http://www.chicagomanualofstyle.org/tools_citationguide.html" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
diff --git a/csl/cse.csl b/csl/cse.csl
index 3ded3b9cb2..15d766d9b1 100644
--- a/csl/cse.csl
+++ b/csl/cse.csl
@@ -1,167 +1,166 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>Council of Science Editors</title>
-    <id>http://www.zotero.org/styles/cse</id>
-    <link>http://www.zotero.org/styles/cse</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="science"/>
-    <updated/>
-    <summary>The Council of Science Editors style.</summary>
-    <source>http://www.dianahacker.com/resdoc/p04_c11_s1.html</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="long" prefix=", " text-case="lowercase" suffix="."/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <group suffix=".">
-      <names variable="author">
-	<name name-as-sort-order="all" sort-separator=" " initialize-with=""
-	      delimiter=", " delimiter-precedes-last="always"/>
-	<label form="short" prefix=" " suffix="" text-case="lowercase"/>
-	<substitute>
-	  <names variable="editor"/>
-	  <text macro="anon"/>
-	</substitute>
-      </names>
-    </group>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="symbol" delimiter=", " initialize-with="."/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <text value="Available from:" suffix=" "/>
-      <text variable="URL"/>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="issued">
-    <date variable="issued" delimiter=" ">
-      <date-part name="year"/>
-      <date-part name="month" prefix=" "/>
-      <date-part name="day" prefix=" "/>
-    </date>
-    <group prefix=" [" suffix="]" delimiter=" ">
-      <text term="cited"/>   
-      <date variable="accessed" >
-	<date-part name="year"/>
-	<date-part name="month" prefix=" "/>
-	<date-part name="day" prefix=" "/>
-      </date>
-    </group>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". "/>
-    <text variable="page"/>
-  </macro>
-  <macro name="journal">
-    <text variable="container-title"/>
-    <choose>
-      <if variable="URL">
-	<text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
-      </if>
-    </choose>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout delimiter="," vertical-align="sup">
-      <text variable="citation-number" />
-      <group prefix="(" suffix=")">
-	<label variable="locator" form="short"/>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="false"/>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="10"/>
-    <layout>
-      <text variable="citation-number" prefix="" suffix=". "/>
-      <text macro="author" suffix=""/>
-      <choose>
-	<if type="book">
-	  <group suffix=".">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text macro="editor" prefix=" (" suffix=")"/>
-	  </group>
-	  <text prefix=" " suffix="" macro="publisher"/>
-	  <group suffix="." prefix="; " delimiter=" ">
-	    <date variable="issued">
-	      <date-part name="year"/>
-	    </date>
-	    <text macro="pages"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="capitalize-first" suffix=": "/>
-	    <text macro="editor"/>
-	    <text variable="container-title"  prefix=" " suffix="."/>
-	    <text variable="volume" prefix=" Vol. " suffix="."/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group suffix="." prefix="; " delimiter=". ">
-		<date variable="issued">
-		  <date-part name="year"/>
-		</date>
-		<text macro="pages"/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text macro="journal" suffix="."/>
-	    <group delimiter=";" prefix=" ">
-	      <text macro="issued"/>
-	      <group>
-		<text variable="volume" />
-		<text variable="issue" prefix="(" suffix=")"/>
-	      </group>
-	    </group>
-	    <text variable="page" prefix=":"/>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access"/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>Council of Science Editors</title>
+    <id>http://www.zotero.org/styles/cse</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="science"/>
+    <updated/>
+    <summary>The Council of Science Editors style.</summary>
+    <link href="http://www.dianahacker.com/resdoc/p04_c11_s1.html" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+	<name name-as-sort-order="all" sort-separator=" " initialize-with=""
+	      delimiter=", " delimiter-precedes-last="always"/>
+	<label form="short" prefix=" " suffix="" text-case="lowercase"/>
+	<substitute>
+	  <names variable="editor"/>
+	  <text macro="anon"/>
+	</substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="symbol" delimiter=", " initialize-with="."/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text value="Available from:" suffix=" "/>
+      <text variable="URL"/>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year"/>
+      <date-part name="month" prefix=" "/>
+      <date-part name="day" prefix=" "/>
+    </date>
+    <group prefix=" [" suffix="]" delimiter=" ">
+      <text term="cited"/>   
+      <date variable="accessed" >
+	<date-part name="year"/>
+	<date-part name="month" prefix=" "/>
+	<date-part name="day" prefix=" "/>
+      </date>
+    </group>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="journal">
+    <text variable="container-title"/>
+    <choose>
+      <if variable="URL">
+	<text term="internet" prefix=" [" suffix="]" text-case="capitalize-first"/>
+      </if>
+    </choose>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number" />
+      <group prefix="(" suffix=")">
+	<label variable="locator" form="short"/>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="false"/>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="10"/>
+    <layout>
+      <text variable="citation-number" prefix="" suffix=". "/>
+      <text macro="author" suffix=""/>
+      <choose>
+	<if type="book">
+	  <group suffix=".">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" prefix=" " suffix=" ed."/>
+	    <text macro="editor" prefix=" (" suffix=")"/>
+	  </group>
+	  <text prefix=" " suffix="" macro="publisher"/>
+	  <group suffix="." prefix="; " delimiter=" ">
+	    <date variable="issued">
+	      <date-part name="year"/>
+	    </date>
+	    <text macro="pages"/>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="capitalize-first" suffix=": "/>
+	    <text macro="editor"/>
+	    <text variable="container-title"  prefix=" " suffix="."/>
+	    <text variable="volume" prefix=" Vol. " suffix="."/>
+	    <text variable="edition" prefix=" " suffix=" ed."/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group suffix="." prefix="; " delimiter=". ">
+		<date variable="issued">
+		  <date-part name="year"/>
+		</date>
+		<text macro="pages"/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text macro="journal" suffix="."/>
+	    <group delimiter=";" prefix=" ">
+	      <text macro="issued"/>
+	      <group>
+		<text variable="volume" />
+		<text variable="issue" prefix="(" suffix=")"/>
+	      </group>
+	    </group>
+	    <text variable="page" prefix=":"/>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/fems.csl b/csl/fems.csl
index deadc7e8c9..529dbc1117 100644
--- a/csl/fems.csl
+++ b/csl/fems.csl
@@ -1,193 +1,193 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>FEMS based Journal</title>
-    <id>http://www.zotero.org/styles/fems</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="biology"/>
-    <updated/>
-    <summary>The Various FEMS Journal styles, including FEMS Microbiology Ecology
-FEMS Immunology and Medical Microbiology
-FEMS Microbiology Letters
-FEMS Microbiology Reviews
-FEMS Yeast Research</summary>
-    <source>http://www.blackwellpublishing.com/submit.asp?ref=1567-1356%26site=1</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <name and="symbol" delimiter=", " name-as-sort-order="all" sort-separator=", " initialize-with="" text-case="capitalize-first"/>
-      <label form="short" text-case="lowercase" prefix=", " />
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always" initialize-with=""/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", " >
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </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">
-    <label variable="page" suffix=". " form="short"/>
-    <text variable="page"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" />
-	<text macro="year-date" prefix="(" suffix=")"/>
-      </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" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", " suffix=".">
-	      <text variable="container-title" font-style="italic"/>
-	      <group delimiter=" ">
-		<text variable="volume" prefix="Vol. "/>
-		<text macro="editor" prefix=" (" suffix=")"/>
-		<text variable="collection-title" font-style="italic"/>
-		<text macro="series-editor"/>
-	      </group>
-	      <text macro="page"/>
-	    </group>
-	    <text macro="publisher" prefix=" "/>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic" form="short"/>
-	    <group delimiter=": ">
-	      <text variable="volume"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>FEMS based Journal</title>
+    <id>http://www.zotero.org/styles/fems</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="biology"/>
+    <updated/>
+    <summary>The Various FEMS Journal styles, including FEMS Microbiology Ecology
+FEMS Immunology and Medical Microbiology
+FEMS Microbiology Letters
+FEMS Microbiology Reviews
+FEMS Yeast Research</summary>
+    <link href="http://www.blackwellpublishing.com/submit.asp?ref=1567-1356%26site=1" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="symbol" delimiter=", " name-as-sort-order="all" sort-separator=", " initialize-with="" text-case="capitalize-first"/>
+      <label form="short" text-case="lowercase" prefix=", " />
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="symbol" name-as-sort-order="all" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always" initialize-with=""/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " >
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </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">
+    <label variable="page" suffix=". " form="short"/>
+    <text variable="page"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" />
+	<text macro="year-date" prefix="(" suffix=")"/>
+      </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" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", " suffix=".">
+	      <text variable="container-title" font-style="italic"/>
+	      <group delimiter=" ">
+		<text variable="volume" prefix="Vol. "/>
+		<text macro="editor" prefix=" (" suffix=")"/>
+		<text variable="collection-title" font-style="italic"/>
+		<text macro="series-editor"/>
+	      </group>
+	      <text macro="page"/>
+	    </group>
+	    <text macro="publisher" prefix=" "/>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic" form="short"/>
+	    <group delimiter=": ">
+	      <text variable="volume"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/genesdev.csl b/csl/genesdev.csl
index 39ce6d7057..9d5664ed2c 100644
--- a/csl/genesdev.csl
+++ b/csl/genesdev.csl
@@ -1,192 +1,192 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Genes and Development Journal</title>
-    <id>http://www.zotero.org/styles/genesdev</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="biology"/>
-    <updated/>
-    <summary>The Genes and Development Journal style</summary>
-    <source>http://www.genesdev.org/misc/ifora.shtml</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="short" text-case="lowercase" suffix=". " />
-      <name and="text" delimiter=", " initialize-with="." text-case="capitalize-first"/>
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always" initialize-with="."/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", " >
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </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">
-      <label variable="page" suffix=". " form="short"/>
-      <text variable="page"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </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" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", ">
-	      <group delimiter=" ">
-		<text term="in" text-case="capitalize-first"/>
-		<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 macro="page"/>
-	      <text macro="publisher" prefix=" "/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=": ">
-	      <text variable="volume" font-weight="bold"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Genes and Development Journal</title>
+    <id>http://www.zotero.org/styles/genesdev</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="biology"/>
+    <updated/>
+    <summary>The Genes and Development Journal style</summary>
+    <link href="http://www.genesdev.org/misc/ifora.shtml" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="lowercase" suffix=". " />
+      <name and="text" delimiter=", " initialize-with="." text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always" initialize-with="."/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " >
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </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">
+      <label variable="page" suffix=". " form="short"/>
+      <text variable="page"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </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" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", ">
+	      <group delimiter=" ">
+		<text term="in" text-case="capitalize-first"/>
+		<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 macro="page"/>
+	      <text macro="publisher" prefix=" "/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <group delimiter=": ">
+	      <text variable="volume" font-weight="bold"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/genomebiology.csl b/csl/genomebiology.csl
index 6a5cdc99bd..871b8e1925 100644
--- a/csl/genomebiology.csl
+++ b/csl/genomebiology.csl
@@ -1,125 +1,124 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Genome Biology Journal</title>
-    <id>http://www.zotero.org/styles/genomebiology</id>
-    <link>http://www.zotero.org/styles/genomebiology</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="biology"/>
-    <updated/>
-    <summary>Genome Biology Journal style.</summary>
-    <source>http://genomebiology.com/info/authors/instructions</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <label form="verb" text-case="capitalize-first" suffix=" "/>
-      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
-	     delimiter=", " delimiter-precedes-last="always"/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text variable="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <text value="Available:" suffix=" "/>
-      <text variable="URL" suffix="."/>
-      <group prefix=" " suffix="">
-	<text term="accessed" text-case="capitalize-first" suffix=" "/>
-	<date variable="accessed">
-	  <date-part name="day" suffix=" "/>
-	  <date-part name="month" suffix=" "/>
-	  <date-part name="year"/>
-	</date>
-      </group>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title" font-weight="bold"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="cite-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout prefix="[" suffix="]" delimiter=",">
-      <text variable="citation-number" />
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="5"/>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix=":"/>
-      <choose>
-	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title" suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	    <text macro="publisher" suffix=";"/>
-	    <text macro="cite-date"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix=". "/>
-	  <group class="container" prefix=" " delimiter=" " suffix=".">
-	    <text term="in" text-case="capitalize-first" suffix=""/>
-	    <group delimiter=". ">
-	      <text variable="container-title" font-style="italic"/>
-	      <text variable="collection-title" prefix=" " suffix="."/>
-	      <text macro="editor"/>
-	    </group>
-	  </group>
-	  <group suffix="." delimiter=" ">
-	    <text macro="publisher" prefix=" " suffix=";"/>
-	    <text variable="volume" prefix="Vol. "/>
-	    <group delimiter=":">
-	      <text macro="cite-date"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix=". "/>
-	  <group class="container" suffix=", " delimiter=" ">
-	    <text variable="container-title" form="short" font-style="italic"/>
-	    <text macro="cite-date"/>
-	  </group>
-	  <text variable="volume" font-weight="bold"/>
-	  <text variable="page" prefix=":"/>
-	  <text variable="DOI"/>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" />
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Genome Biology Journal</title>
+    <id>http://www.zotero.org/styles/genomebiology</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="biology"/>
+    <updated/>
+    <summary>Genome Biology Journal style.</summary>
+    <link href="http://genomebiology.com/info/authors/instructions" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="verb" text-case="capitalize-first" suffix=" "/>
+      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
+	     delimiter=", " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text value="Available:" suffix=" "/>
+      <text variable="URL" suffix="."/>
+      <group prefix=" " suffix="">
+	<text term="accessed" text-case="capitalize-first" suffix=" "/>
+	<date variable="accessed">
+	  <date-part name="day" suffix=" "/>
+	  <date-part name="month" suffix=" "/>
+	  <date-part name="year"/>
+	</date>
+      </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title" font-weight="bold"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="cite-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <text variable="citation-number" />
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="5"/>
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author" suffix=":"/>
+      <choose>
+	<if type="book">
+	  <group delimiter=" " prefix=" ">
+	    <text macro="title" suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	    <text macro="publisher" suffix=";"/>
+	    <text macro="cite-date"/>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix=". "/>
+	  <group class="container" prefix=" " delimiter=" " suffix=".">
+	    <text term="in" text-case="capitalize-first" suffix=""/>
+	    <group delimiter=". ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="collection-title" prefix=" " suffix="."/>
+	      <text macro="editor"/>
+	    </group>
+	  </group>
+	  <group suffix="." delimiter=" ">
+	    <text macro="publisher" prefix=" " suffix=";"/>
+	    <text variable="volume" prefix="Vol. "/>
+	    <group delimiter=":">
+	      <text macro="cite-date"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <text macro="title" prefix=" " suffix=". "/>
+	  <group class="container" suffix=", " delimiter=" ">
+	    <text variable="container-title" form="short" font-style="italic"/>
+	    <text macro="cite-date"/>
+	  </group>
+	  <text variable="volume" font-weight="bold"/>
+	  <text variable="page" prefix=":"/>
+	  <text variable="DOI"/>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" />
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/harvard1.csl b/csl/harvard1.csl
index 2ac30ed9f1..df95602797 100644
--- a/csl/harvard1.csl
+++ b/csl/harvard1.csl
@@ -1,164 +1,164 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Harvard Reference format 1 (Author-Date)</title>
-    <id>http://www.zotero.org/styles/harvard1</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="generic-base"/>
-    <updated/>
-    <summary>The Harvard author-date style</summary>
-    <source>http://libweb.anglia.ac.uk/referencing/harvard.htm</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name and="symbol" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="."
-	    delimiter=", "/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text macro="anon"/>
-      </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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<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="year-date">
-    <choose>
-      <if variable="issued">
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
-      </if>
-      <else>
-	  <text term="no date"/>
-      </else>
-    </choose>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <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>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <text macro="author" suffix=","/>
-      <date variable="issued" prefix=" " suffix=".">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group suffix=",">
-	    <text macro="title" prefix=" "/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="capitalize-first"/>
-	    <text macro="editor" prefix=" "/>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group prefix=", ">
-		<text variable="page" prefix="p. "/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=", ">
-	      <text variable="volume" />
-	      <text variable="issue" prefix="(" suffix=")"/>
-	    </group>
-	    <group prefix=", ">
-	      <text variable="page" prefix="p."/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Harvard Reference format 1 (Author-Date)</title>
+    <id>http://www.zotero.org/styles/harvard1</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="generic-base"/>
+    <updated/>
+    <summary>The Harvard author-date style</summary>
+    <link href="http://libweb.anglia.ac.uk/referencing/harvard.htm" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="symbol" initialize-with=". " delimiter=", "/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="."
+	    delimiter=", "/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text macro="anon"/>
+      </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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<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="year-date">
+    <choose>
+      <if variable="issued">
+	<date variable="issued">
+	  <date-part name="year"/>
+	</date>
+      </if>
+      <else>
+	  <text term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <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>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <text macro="author" suffix=","/>
+      <date variable="issued" prefix=" " suffix=".">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group suffix=",">
+	    <text macro="title" prefix=" "/>
+	    <text variable="edition" prefix=" " suffix=" ed."/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <text prefix=" " suffix="." macro="publisher"/>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="capitalize-first"/>
+	    <text macro="editor" prefix=" "/>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group prefix=", ">
+		<text variable="page" prefix="p. "/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=", ">
+	      <text variable="volume" />
+	      <text variable="issue" prefix="(" suffix=")"/>
+	    </group>
+	    <group prefix=", ">
+	      <text variable="page" prefix="p."/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/harvard2.csl b/csl/harvard2.csl
index 728fb9f4a7..ec40d2419d 100644
--- a/csl/harvard2.csl
+++ b/csl/harvard2.csl
@@ -1,173 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>Harvard Reference format 2</title>
-    <id>http://www.zotero.org/styles/harvard2</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="generic-base"/>
-    <updated></updated>
-    <summary>The Harvard author-date style</summary>
-    <source>http://www.leeds.ac.uk/library/training/referencing/harvard.htm</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
-      <name and="symbol" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="."
-	    delimiter=", "/>
-      <label form="short" prefix=" (" suffix=")." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text macro="anon"/>
-      </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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<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="year-date">
-    <group prefix=" ">
-      <choose>
-	<if variable="issued">
-	  <date variable="issued">
-	    <date-part name="year"/>
-	  </date>
-	</if>
-	<else>
-	  <text term="no date"/>
-	</else>
-      </choose>
-    </group>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<group>
-	  <label variable="locator" suffix="." form="short"/>
-	  <text variable="locator" prefix=" "/>
-	</group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="2"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <text macro="author" suffix=""/>
-      <date variable="issued" prefix=" " suffix=".">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text macro="editor" prefix=" (" suffix=")"/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" "/>
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="lowercase"/>
-	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
-	      <name and="symbol" sort-separator=", " initialize-with=". "/>
-	      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-	    </names>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group prefix=", ">
-		<label variable="page" form="short" suffix=". "/>
-		<text variable="page"/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=", ">
-	      <text variable="volume" font-weight="bold"/>
-	      <text variable="issue" prefix="(" suffix=")"/>
-	    </group>
-	    <group prefix=", ">
-	      <label variable="page" form="short" suffix="."/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>Harvard Reference format 2</title>
+    <id>http://www.zotero.org/styles/harvard2</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="generic-base"/>
+    <updated></updated>
+    <summary>The Harvard author-date style</summary>
+    <link href="http://www.leeds.ac.uk/library/training/referencing/harvard.htm" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" prefix="" suffix="" delimiter=", ">
+      <name and="symbol" initialize-with=". " delimiter=", "/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with="."
+	    delimiter=", "/>
+      <label form="short" prefix=" (" suffix=")." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text macro="anon"/>
+      </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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<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="year-date">
+    <group prefix=" ">
+      <choose>
+	<if variable="issued">
+	  <date variable="issued">
+	    <date-part name="year"/>
+	  </date>
+	</if>
+	<else>
+	  <text term="no date"/>
+	</else>
+      </choose>
+    </group>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<group>
+	  <label variable="locator" suffix="." form="short"/>
+	  <text variable="locator" prefix=" "/>
+	</group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="2"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <text macro="author" suffix=""/>
+      <date variable="issued" prefix=" " suffix=".">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group suffix=".">
+	    <text macro="title" prefix=" "/>
+	    <text variable="edition" prefix=" " suffix=" ed."/>
+	    <text macro="editor" prefix=" (" suffix=")"/>
+	  </group>
+	  <text prefix=" " suffix="." macro="publisher"/>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" "/>
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="lowercase"/>
+	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
+	      <name and="symbol" sort-separator=", " initialize-with=". "/>
+	      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+	    </names>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix="."/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group prefix=", ">
+		<label variable="page" form="short" suffix=". "/>
+		<text variable="page"/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=", ">
+	      <text variable="volume" font-weight="bold"/>
+	      <text variable="issue" prefix="(" suffix=")"/>
+	    </group>
+	    <group prefix=", ">
+	      <label variable="page" form="short" suffix="."/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/harvard3.csl b/csl/harvard3.csl
index 21a2f6bf17..84e557840c 100644
--- a/csl/harvard3.csl
+++ b/csl/harvard3.csl
@@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Harvard Reference format 3</title>
-    <id>http://www.zotero.org/styles/harvard3</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="generic-base"/>
-    <updated></updated>
-    <summary>The Harvard author-date style</summary>
-    <source>http://library.curtin.edu.au/referencing/harvard.pdf</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name and="symbol" initialize-with="" delimiter=", "/>
-      <label form="short" prefix=" ("  text-case="lowercase" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=""
-	    delimiter=", "/>
-      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text macro="anon"/>
-      </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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="URL">
-	<text term="retrieved" text-case="capitalize-first"/>
-	<group prefix=" " delimiter=", ">
-	  <date variable="accessed" >
-	    <date-part name="month" suffix=" "/>
-	    <date-part name="day" suffix=", "/>
-	    <date-part name="year"/>
-	  </date>
-	  <group delimiter=" ">
-	    <text term="from"/>
-	    <text variable="URL"/>
-	  </group>
-	</group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title" quotes="true"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if variable="issued">
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
-      </if>
-      <else>
-	  <text term="no date"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". "/>
-    <text variable="page"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <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>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="4"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <text macro="author" />
-      <date variable="issued" prefix=" " suffix=",">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group suffix=",">
-	    <text macro="title" prefix=" "/>
-	    <text variable="edition" prefix=" " suffix=" ed."/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" "/>
-	  <group class="container" prefix=", ">
-	    <text term="in" text-case="lowercase"/>
-	    <text macro="editor" prefix=" " suffix=", "/>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-	    <text variable="collection-title" prefix=" " suffix=","/>
-	    <group suffix="." delimiter=", ">
-	      <text macro="publisher" prefix=" "/>
-	      <text macro="pages"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=", " delimiter=", ">
-	      <text variable="volume" prefix="vol. "/>
-	      <text variable="issue" prefix="no. " />
-	      <text macro="pages"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" />
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Harvard Reference format 3</title>
+    <id>http://www.zotero.org/styles/harvard3</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="generic-base"/>
+    <updated></updated>
+    <summary>The Harvard author-date style</summary>
+    <link href="http://library.curtin.edu.au/referencing/harvard.pdf" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="symbol" initialize-with="" delimiter=", "/>
+      <label form="short" prefix=" ("  text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=""
+	    delimiter=", "/>
+      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text macro="anon"/>
+      </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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+	<text term="retrieved" text-case="capitalize-first"/>
+	<group prefix=" " delimiter=", ">
+	  <date variable="accessed" >
+	    <date-part name="month" suffix=" "/>
+	    <date-part name="day" suffix=", "/>
+	    <date-part name="year"/>
+	  </date>
+	  <group delimiter=" ">
+	    <text term="from"/>
+	    <text variable="URL"/>
+	  </group>
+	</group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+	<date variable="issued">
+	  <date-part name="year"/>
+	</date>
+      </if>
+      <else>
+	  <text term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". "/>
+    <text variable="page"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <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>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="4"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <text macro="author" />
+      <date variable="issued" prefix=" " suffix=",">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group suffix=",">
+	    <text macro="title" prefix=" "/>
+	    <text variable="edition" prefix=" " suffix=" ed."/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <text prefix=" " suffix="." macro="publisher"/>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" "/>
+	  <group class="container" prefix=", ">
+	    <text term="in" text-case="lowercase"/>
+	    <text macro="editor" prefix=" " suffix=", "/>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+	    <text variable="collection-title" prefix=" " suffix=","/>
+	    <group suffix="." delimiter=", ">
+	      <text macro="publisher" prefix=" "/>
+	      <text macro="pages"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=", " delimiter=", ">
+	      <text variable="volume" prefix="vol. "/>
+	      <text variable="issue" prefix="no. " />
+	      <text macro="pages"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" />
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/history-theory.csl b/csl/history-theory.csl
index 676c9a48a5..4716d39e0c 100644
--- a/csl/history-theory.csl
+++ b/csl/history-theory.csl
@@ -2,8 +2,7 @@
   <info>
     <title>History and Theory Journal</title>
     <id>http://www.zotero.org/styles/history-theory</id>
-    <link>http://www.zotero.org/styles/history-theory</link>
-    <source>http://www.wesleyan.edu/histjrnl/stylesht.html</source>
+    <link href="http://www.wesleyan.edu/histjrnl/stylesht.html" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
diff --git a/csl/ieee.csl b/csl/ieee.csl
index ba38fa7404..6fed603ee0 100644
--- a/csl/ieee.csl
+++ b/csl/ieee.csl
@@ -4,7 +4,6 @@
   <info>
     <title>IEEE</title>
     <id>http://www.zotero.org/styles/ieee</id>
-    <link>http://www.zotero.org/styles/ieee</link>
     <author>
       <name>Michael Berkowitz</name>
       <email>mberkowi@gmu.edu</email>
diff --git a/csl/inter-ro.csl b/csl/inter-ro.csl
index e7d878015c..659f30230d 100644
--- a/csl/inter-ro.csl
+++ b/csl/inter-ro.csl
@@ -1,333 +1,332 @@
-<?oxygen RNGSchema="http://xbiblio.svn.sourceforge.net/viewvc/*checkout*/xbiblio/csl/schema/trunk/csl.rnc" type="compact"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="ro">
-    <info>
-        <title>INTER. Romanian Institute for Inter-Orthodox, Inter-Confessional and Inter-Religious Studies</title>
-        <id>http://www.zotero.org/styles/inter-ro</id>
-        <link>https://www.zotero.org/svn/extension/trunk/csl/inter-ro.csl</link>
-        <author>
-            <name>Nicolae Turcan</name>
-            <email>nicturcan@gmail.com</email>
-        </author>
-        <category term="theology"/>
-        <category term="generic-base"/>
-        <category term="author-date"/>
-        <updated>2007-09-26T10:58:54+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="long" delimiter="; " delimiter-precedes-last="always" font-variant="small-caps" sort-separator=", "/>
-            <label form="short" prefix=" (" suffix=".)"/>
-            <substitute>
-                <names variable="editor" font-variant="small-caps"/>
-                <names variable="translator" font-variant="small-caps"/>
-                <text macro="title"/>
-            </substitute>
-        </names>
-    </macro>
-    <macro name="author-bibliography">
-        <names variable="author">
-            <name name-as-sort-order="all" form="long" delimiter="; " delimiter-precedes-last="always" font-variant="small-caps" sort-separator=", "/>
-            <label form="short" prefix=" (" suffix=".)"/>
-            <substitute>
-                <names variable="editor" font-variant="small-caps"/>
-                <names variable="translator" font-variant="small-caps"/>
-                <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="at" suffix=" "/>
-                <text variable="URL"/>
-            </group>
-        </group>
-    </macro>
-    <macro name="title">
-        <choose>
-            <if type="book">
-                <text variable="title" text-case="sentence" font-style="italic"/>
-            </if>
-            <else>
-                <text variable="title" text-case="sentence" prefix="&#8222;"
-                    suffix="&#8221;"/>
-            </else>
-        </choose>
-    </macro>
-    <macro name="title-short">
-        <choose>
-            <if type="book">
-                <text variable="title" text-case="sentence" font-style="italic" form="short"/>
-            </if>
-            <else>
-                <text variable="title" text-case="sentence" prefix="&#8222;"
-                    suffix="&#8221;" form="short"/>
-            </else>
-        </choose>
-    </macro>
-    <macro name="publisher">
-        <group delimiter=", ">
-            <text variable="publisher"/>
-            <text variable="publisher-place"/>
-        </group>
-    </macro>
-    <citation>
-        <option name="et-al-min" value="6"/>
-        <option name="et-al-use-first" value="1"/>
-        <option name="et-al-subsequent-min" value="3"/>
-        <option name="et-al-subsequent-use-first" value="1"/>
-        <option name="collapse" value="year"/>
-        <sort>
-            <key macro="author"/>
-            <key variable="issued"/>
-        </sort>
-        <layout suffix=".">
-            <choose>
-                <if position="first">
-                    <choose>
-                        <if type="book">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <group delimiter=" ">
-                                    <text macro="title"/>
-                                    <text variable="volume"/>
-                                    <text variable="collection-title" prefix="(= " suffix=")"/>
-                                </group>
-                                <text macro="editor-translator"/>
-                                <text variable="edition"/>
-                                <text macro="publisher"/>
-                                <date variable="issued">
-                                    <date-part name="year"/>
-                                </date>
-                                <group>
-                                    <label variable="locator" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                                <text macro="access"/>
-                            </group>
-                        </if>
-                        <else-if type="chapter">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <text macro="title"/>
-                                <group delimiter=" " class="container">
-                                    <text term="in"/>
-                                    <names variable="editor translator" delimiter=", ">
-                                        <name sort-separator=", " font-variant="small-caps"/>
-                                        <label form="short" prefix="(" suffix=".)"
-                                            text-case="lowercase"/>
-                                    </names>
-                                    <text variable="container-title" font-style="italic"/>
-                                    <text variable="volume"/>
-                                    <text variable="collection-title" prefix="(= " suffix=")"/>
-                                </group>
-                                <text macro="editor-translator"/>
-                                <text variable="edition"/>
-                                <text macro="publisher"/>
-                                <date variable="issued">
-                                    <date-part name="year"/>
-                                </date>
-                                <group>
-                                    <label variable="locator" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                                <text macro="access"/>
-                            </group>
-                        </else-if>
-                        <else-if type="article">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <text macro="title"/>
-                                <group delimiter=" ">
-                                    <text variable="container-title" font-style="italic"/>
-                                    <group delimiter=", ">
-                                        <text variable="volume"/>
-                                        <text variable="issue"/>
-                                    </group>
-                                    <date variable="issued">
-                                        <date-part name="year" prefix="(" suffix=")"/>
-                                    </date>
-                                </group>
-                                <text macro="editor-translator"/>
-                                <text variable="edition"/>
-                                <text macro="publisher"/>
-                                <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"/>
-                                <text macro="editor-translator"/>
-                                <group class="container" delimiter=" ">
-                                    <text variable="container-title" font-style="italic"/>
-                                    <group delimiter=", ">
-                                        <text variable="volume"/>
-                                        <text variable="issue"/>
-                                    </group>
-                                    <group>
-                                        <label variable="locator" include-period="true" form="short"/>
-                                        <text variable="locator" prefix=" "/>
-                                    </group>
-                                </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" include-period="true" 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="book">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <group delimiter=" ">
-                                    <text macro="title-short"/>
-                                    <text variable="volume"/>
-                                </group>
-                                <group>
-                                    <label variable="locator" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                            </group>
-                        </if>
-                        <else>
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <text macro="title-short"/>
-                                <group>
-                                    <label variable="locator" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                            </group>
-                        </else>
-                    </choose>
-                </else-if>
-            </choose>
-        </layout>
-    </citation>
-    <bibliography>
-        <option name="hanging-indent" value="true"/>
-        <option name="et-al-min" value="6"/>
-        <option name="et-al-use-first" value="6"/>
-        <sort>
-            <key macro="author-bibliography"/>
-            <key variable="title"/>
-        </sort>
-        <layout suffix=".">
-            <text macro="author-bibliography" suffix=", "/>
-            <choose>
-                <if type="book">
-                    <group delimiter=", ">
-                        <group delimiter=" ">
-                            <text macro="title"/>
-                            <text variable="volume"/>
-                            <text variable="collection-title" prefix="(= " suffix=")"/>
-                        </group>
-                        <text macro="editor-translator"/>
-                        <text variable="edition"/>
-                        <text macro="publisher"/>
-                        <date variable="issued">
-                            <date-part name="year"/>
-                        </date>
-                        <group>
-                            <label variable="page" include-period="true" form="short"/>
-                            <text variable="page" prefix=" "/>
-                        </group>
-                    </group>
-                </if>
-                <else-if type="chapter">
-                    <group delimiter=", ">
-                        <text macro="title"/>
-                        <group delimiter=" " class="container">
-                            <text term="in"/>
-                            <names variable="editor translator" delimiter=", ">
-                                <name sort-separator=", " font-variant="small-caps"/>
-                                <label form="short" prefix="(" suffix=".)" text-case="lowercase"/>
-                            </names>
-                            <text variable="container-title" font-style="italic"/>
-                            <text variable="volume"/>
-                            <text variable="collection-title" prefix="(= " suffix=")"/>
-                        </group>
-                        <text macro="editor-translator"/>
-                        <text variable="edition"/>
-                        <text macro="publisher"/>
-                        <date variable="issued">
-                            <date-part name="year"/>
-                        </date>
-                        <group>
-                            <label variable="page" include-period="true" form="short"/>
-                            <text variable="page" prefix=" "/>
-                        </group>
-                    </group>
-                </else-if>
-                <else-if type="article">
-                    <group delimiter=", ">
-                        <text macro="title"/>
-                        <group delimiter=" ">
-                            <text variable="container-title" font-style="italic"/>
-                            <group delimiter=", ">
-                                <text variable="volume"/>
-                                <text variable="issue"/>
-                            </group>
-                            <date variable="issued">
-                                <date-part name="year" prefix="(" suffix=")"/>
-                            </date>
-                        </group>
-                        <text macro="editor-translator"/>
-                        <text variable="edition"/>
-                        <text macro="publisher"/>
-                        <group>
-                            <label variable="page" include-period="true" form="short"/>
-                            <text variable="page" prefix=" "/>
-                        </group>
-                    </group>
-                </else-if>
-                <else>
-                    <group delimiter=", ">
-                        <text macro="title"/>
-                        <text macro="editor-translator"/>
-                        <group class="container" delimiter=" ">
-                            <text variable="container-title" font-style="italic"/>
-                            <group delimiter=", ">
-                                <text variable="volume"/>
-                                <text variable="issue"/>
-                            </group>
-                            <group>
-                                <label variable="page" include-period="true" form="short"/>
-                                <text variable="page" prefix=" "/>
-                            </group>
-                        </group>
-                    </group>
-                </else>
-            </choose>
-            <text prefix=", " macro="access"/>
-        </layout>
-    </bibliography>
-</style>
+<?oxygen RNGSchema="http://xbiblio.svn.sourceforge.net/viewvc/*checkout*/xbiblio/csl/schema/trunk/csl.rnc" type="compact"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="ro">
+    <info>
+        <title>INTER. Romanian Institute for Inter-Orthodox, Inter-Confessional and Inter-Religious Studies</title>
+        <id>http://www.zotero.org/styles/inter-ro</id>
+        <author>
+            <name>Nicolae Turcan</name>
+            <email>nicturcan@gmail.com</email>
+        </author>
+        <category term="theology"/>
+        <category term="generic-base"/>
+        <category term="author-date"/>
+        <updated>2007-09-26T10:58:54+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="long" delimiter="; " delimiter-precedes-last="always" font-variant="small-caps" sort-separator=", "/>
+            <label form="short" prefix=" (" suffix=".)"/>
+            <substitute>
+                <names variable="editor" font-variant="small-caps"/>
+                <names variable="translator" font-variant="small-caps"/>
+                <text macro="title"/>
+            </substitute>
+        </names>
+    </macro>
+    <macro name="author-bibliography">
+        <names variable="author">
+            <name name-as-sort-order="all" form="long" delimiter="; " delimiter-precedes-last="always" font-variant="small-caps" sort-separator=", "/>
+            <label form="short" prefix=" (" suffix=".)"/>
+            <substitute>
+                <names variable="editor" font-variant="small-caps"/>
+                <names variable="translator" font-variant="small-caps"/>
+                <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="at" suffix=" "/>
+                <text variable="URL"/>
+            </group>
+        </group>
+    </macro>
+    <macro name="title">
+        <choose>
+            <if type="book">
+                <text variable="title" text-case="sentence" font-style="italic"/>
+            </if>
+            <else>
+                <text variable="title" text-case="sentence" prefix="&#8222;"
+                    suffix="&#8221;"/>
+            </else>
+        </choose>
+    </macro>
+    <macro name="title-short">
+        <choose>
+            <if type="book">
+                <text variable="title" text-case="sentence" font-style="italic" form="short"/>
+            </if>
+            <else>
+                <text variable="title" text-case="sentence" prefix="&#8222;"
+                    suffix="&#8221;" form="short"/>
+            </else>
+        </choose>
+    </macro>
+    <macro name="publisher">
+        <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+        </group>
+    </macro>
+    <citation>
+        <option name="et-al-min" value="6"/>
+        <option name="et-al-use-first" value="1"/>
+        <option name="et-al-subsequent-min" value="3"/>
+        <option name="et-al-subsequent-use-first" value="1"/>
+        <option name="collapse" value="year"/>
+        <sort>
+            <key macro="author"/>
+            <key variable="issued"/>
+        </sort>
+        <layout suffix=".">
+            <choose>
+                <if position="first">
+                    <choose>
+                        <if type="book">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <group delimiter=" ">
+                                    <text macro="title"/>
+                                    <text variable="volume"/>
+                                    <text variable="collection-title" prefix="(= " suffix=")"/>
+                                </group>
+                                <text macro="editor-translator"/>
+                                <text variable="edition"/>
+                                <text macro="publisher"/>
+                                <date variable="issued">
+                                    <date-part name="year"/>
+                                </date>
+                                <group>
+                                    <label variable="locator" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                                <text macro="access"/>
+                            </group>
+                        </if>
+                        <else-if type="chapter">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <text macro="title"/>
+                                <group delimiter=" " class="container">
+                                    <text term="in"/>
+                                    <names variable="editor translator" delimiter=", ">
+                                        <name sort-separator=", " font-variant="small-caps"/>
+                                        <label form="short" prefix="(" suffix=".)"
+                                            text-case="lowercase"/>
+                                    </names>
+                                    <text variable="container-title" font-style="italic"/>
+                                    <text variable="volume"/>
+                                    <text variable="collection-title" prefix="(= " suffix=")"/>
+                                </group>
+                                <text macro="editor-translator"/>
+                                <text variable="edition"/>
+                                <text macro="publisher"/>
+                                <date variable="issued">
+                                    <date-part name="year"/>
+                                </date>
+                                <group>
+                                    <label variable="locator" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                                <text macro="access"/>
+                            </group>
+                        </else-if>
+                        <else-if type="article">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <text macro="title"/>
+                                <group delimiter=" ">
+                                    <text variable="container-title" font-style="italic"/>
+                                    <group delimiter=", ">
+                                        <text variable="volume"/>
+                                        <text variable="issue"/>
+                                    </group>
+                                    <date variable="issued">
+                                        <date-part name="year" prefix="(" suffix=")"/>
+                                    </date>
+                                </group>
+                                <text macro="editor-translator"/>
+                                <text variable="edition"/>
+                                <text macro="publisher"/>
+                                <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"/>
+                                <text macro="editor-translator"/>
+                                <group class="container" delimiter=" ">
+                                    <text variable="container-title" font-style="italic"/>
+                                    <group delimiter=", ">
+                                        <text variable="volume"/>
+                                        <text variable="issue"/>
+                                    </group>
+                                    <group>
+                                        <label variable="locator" include-period="true" form="short"/>
+                                        <text variable="locator" prefix=" "/>
+                                    </group>
+                                </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" include-period="true" 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="book">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <group delimiter=" ">
+                                    <text macro="title-short"/>
+                                    <text variable="volume"/>
+                                </group>
+                                <group>
+                                    <label variable="locator" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                            </group>
+                        </if>
+                        <else>
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <text macro="title-short"/>
+                                <group>
+                                    <label variable="locator" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                            </group>
+                        </else>
+                    </choose>
+                </else-if>
+            </choose>
+        </layout>
+    </citation>
+    <bibliography>
+        <option name="hanging-indent" value="true"/>
+        <option name="et-al-min" value="6"/>
+        <option name="et-al-use-first" value="6"/>
+        <sort>
+            <key macro="author-bibliography"/>
+            <key variable="title"/>
+        </sort>
+        <layout suffix=".">
+            <text macro="author-bibliography" suffix=", "/>
+            <choose>
+                <if type="book">
+                    <group delimiter=", ">
+                        <group delimiter=" ">
+                            <text macro="title"/>
+                            <text variable="volume"/>
+                            <text variable="collection-title" prefix="(= " suffix=")"/>
+                        </group>
+                        <text macro="editor-translator"/>
+                        <text variable="edition"/>
+                        <text macro="publisher"/>
+                        <date variable="issued">
+                            <date-part name="year"/>
+                        </date>
+                        <group>
+                            <label variable="page" include-period="true" form="short"/>
+                            <text variable="page" prefix=" "/>
+                        </group>
+                    </group>
+                </if>
+                <else-if type="chapter">
+                    <group delimiter=", ">
+                        <text macro="title"/>
+                        <group delimiter=" " class="container">
+                            <text term="in"/>
+                            <names variable="editor translator" delimiter=", ">
+                                <name sort-separator=", " font-variant="small-caps"/>
+                                <label form="short" prefix="(" suffix=".)" text-case="lowercase"/>
+                            </names>
+                            <text variable="container-title" font-style="italic"/>
+                            <text variable="volume"/>
+                            <text variable="collection-title" prefix="(= " suffix=")"/>
+                        </group>
+                        <text macro="editor-translator"/>
+                        <text variable="edition"/>
+                        <text macro="publisher"/>
+                        <date variable="issued">
+                            <date-part name="year"/>
+                        </date>
+                        <group>
+                            <label variable="page" include-period="true" form="short"/>
+                            <text variable="page" prefix=" "/>
+                        </group>
+                    </group>
+                </else-if>
+                <else-if type="article">
+                    <group delimiter=", ">
+                        <text macro="title"/>
+                        <group delimiter=" ">
+                            <text variable="container-title" font-style="italic"/>
+                            <group delimiter=", ">
+                                <text variable="volume"/>
+                                <text variable="issue"/>
+                            </group>
+                            <date variable="issued">
+                                <date-part name="year" prefix="(" suffix=")"/>
+                            </date>
+                        </group>
+                        <text macro="editor-translator"/>
+                        <text variable="edition"/>
+                        <text macro="publisher"/>
+                        <group>
+                            <label variable="page" include-period="true" form="short"/>
+                            <text variable="page" prefix=" "/>
+                        </group>
+                    </group>
+                </else-if>
+                <else>
+                    <group delimiter=", ">
+                        <text macro="title"/>
+                        <text macro="editor-translator"/>
+                        <group class="container" delimiter=" ">
+                            <text variable="container-title" font-style="italic"/>
+                            <group delimiter=", ">
+                                <text variable="volume"/>
+                                <text variable="issue"/>
+                            </group>
+                            <group>
+                                <label variable="page" include-period="true" form="short"/>
+                                <text variable="page" prefix=" "/>
+                            </group>
+                        </group>
+                    </group>
+                </else>
+            </choose>
+            <text prefix=", " macro="access"/>
+        </layout>
+    </bibliography>
+</style>
diff --git a/csl/iso690-author-date.csl b/csl/iso690-author-date.csl
index d27e31a63e..bcd5a1734d 100644
--- a/csl/iso690-author-date.csl
+++ b/csl/iso690-author-date.csl
@@ -1,186 +1,186 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>ISO-690 (Author-Date format) - UNFINISHED </title>
-    <id>http://www.zotero.org/styles/iso690-author-date</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="generic-base"/>
-    <updated/>
-    <summary>The author-date variant of the ISO 690 style</summary>
-    <source>http://www.collectionscanada.ca/iso/tc46sc9/standard/690-2e.htm</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text" delimiter=", "/>
-      <substitute>
-	<names variable="editor"/>
-	<names variable="translator"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group delimiter=" ">
-      <group prefix=" [" suffix="].">
-	<text term="cited" text-case="lowercase" suffix=" "/>
-	<date variable="accessed">
-	  <date-part name="day" suffix=" "/>
-	  <date-part name="month" form="long" suffix=" "/>
-	  <date-part name="year"/>
-	</date>
-      </group>
-      <text value="Available from world wide web: "/>
-      <text variable="URL" prefix="&lt;" suffix="&gt;"/>
-      </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " >
-      <text variable="publisher-place" prefix="[" suffix="]" />
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="ref-date">
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="year-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <macro name="day-month">
-    <date variable="issued">
-      <date-part name="month"/>
-      <date-part name="day" prefix=" "/>
-    </date>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-      </group>
-      <choose>
-	<if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" />
-	    <text macro="editor" suffix="."/>
-	    <group delimiter=", ">
-	    <text macro="publisher"/>
-	    <text macro="ref-date"/>
-	    </group>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", ">
-	      <group delimiter=" ">
-		<text term="in" text-case="capitalize-first"/>
-		<text variable="container-title" font-style="italic"/>
-	      </group>
-	      <text macro="editor" prefix=" "/>
-	      <group delimiter=" ">
-		<text variable="volume" prefix="Vol. " suffix=" of"/>
-		<text variable="collection-title" font-style="italic"/>
-		<text macro="series-editor"/>
-	      </group>
-	      <text variable="page"/>
-	      <text macro="publisher" prefix=" "/>
-    	      <text macro="ref-date"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=", ">
-	      <group delimiter=", ">
-		<text variable="volume" />
-	      </group>
-	      <text macro="ref-date"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>ISO-690 (Author-Date format) - UNFINISHED </title>
+    <id>http://www.zotero.org/styles/iso690-author-date</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="generic-base"/>
+    <updated/>
+    <summary>The author-date variant of the ISO 690 style</summary>
+    <link href="http://www.collectionscanada.ca/iso/tc46sc9/standard/690-2e.htm" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", "/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group delimiter=" ">
+      <group prefix=" [" suffix="].">
+	<text term="cited" text-case="lowercase" suffix=" "/>
+	<date variable="accessed">
+	  <date-part name="day" suffix=" "/>
+	  <date-part name="month" form="long" suffix=" "/>
+	  <date-part name="year"/>
+	</date>
+      </group>
+      <text value="Available from world wide web: "/>
+      <text variable="URL" prefix="&lt;" suffix="&gt;"/>
+      </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " >
+      <text variable="publisher-place" prefix="[" suffix="]" />
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="ref-date">
+    <date variable="issued">
+      <date-part name="month" suffix=" "/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+      </group>
+      <choose>
+	<if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" />
+	    <text macro="editor" suffix="."/>
+	    <group delimiter=", ">
+	    <text macro="publisher"/>
+	    <text macro="ref-date"/>
+	    </group>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", ">
+	      <group delimiter=" ">
+		<text term="in" text-case="capitalize-first"/>
+		<text variable="container-title" font-style="italic"/>
+	      </group>
+	      <text macro="editor" prefix=" "/>
+	      <group delimiter=" ">
+		<text variable="volume" prefix="Vol. " suffix=" of"/>
+		<text variable="collection-title" font-style="italic"/>
+		<text macro="series-editor"/>
+	      </group>
+	      <text variable="page"/>
+	      <text macro="publisher" prefix=" "/>
+    	      <text macro="ref-date"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <group delimiter=", ">
+	      <group delimiter=", ">
+		<text variable="volume" />
+	      </group>
+	      <text macro="ref-date"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/jbact.csl b/csl/jbact.csl
index 6081b4c5a4..43dfc9bdf0 100644
--- a/csl/jbact.csl
+++ b/csl/jbact.csl
@@ -1,82 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>Journal of Bacteriology</title>
-    <id>http://www.zotero.org/styles/jbact</id>
-    <link>http://www.zotero.org/styles/jbact</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="biology"/>
-    <updated/>
-    <summary>Journal Of Bacteriology style.</summary>
-    <source>http://jb.asm.org/cgi/content/full/189/1/1#References.</source>
-  </info>
-  <macro name="author">
-    <names variable="author" suffix=". ">
-      <name sort-separator=" " initialize-with=". " 
-	    and="text" font-weight="bold"
-	    name-as-sort-order="first" delimiter=", " 
-	    delimiter-precedes-last="always"/>
-    </names>
-  </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name sort-separator=" " initialize-with=". " and="text"
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher" />
-      <text variable="publisher-place" />
-    </group>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography>
-    <layout suffix="." >
-      <group delimiter=" ">
-	<text variable="citation-number" suffix=". "/>
-	<text macro="author"/>
-	<date variable="issued" suffix=".">
-	  <date-part name="year"/>
-	</date>
-	<text variable="title" suffix=". "/>
-	<choose>
-	  <if type="chapter">
-	    <group class="container" delimiter=" ">
-	      <text variable="page" prefix="p. " suffix="."/>
-	      <text term="in" text-case="capitalize-first" font-style="italic"/>
-	      <group delimiter=", ">
-		<text macro="editor"/>
-		<text variable="container-title" />
-		<text variable="collection-title" prefix=" " suffix="."/>
-		<text variable="edition" />
-		<text variable="volume" prefix="vol. " suffix="."/>
-	      </group>
-	      <text macro="publisher"/>
-	    </group>
-	  </if>
-	  <else>
-	    <text variable="container-title" suffix="."/>
-	    <group delimiter=":">
-	      <text variable="volume" font-weight="bold"/>
-	      <text variable="page"/>
-	    </group>
-	  </else>
-	</choose>
-      </group>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>Journal of Bacteriology</title>
+    <id>http://www.zotero.org/styles/jbact</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="biology"/>
+    <updated/>
+    <summary>Journal Of Bacteriology style.</summary>
+    <link href="http://jb.asm.org/cgi/content/full/189/1/1#References" rel="documentation"/>
+  </info>
+  <macro name="author">
+    <names variable="author" suffix=". ">
+      <name sort-separator=" " initialize-with=". " 
+	    and="text" font-weight="bold"
+	    name-as-sort-order="first" delimiter=", " 
+	    delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name sort-separator=" " initialize-with=". " and="text"
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher" />
+      <text variable="publisher-place" />
+    </group>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <layout suffix="." >
+      <group delimiter=" ">
+	<text variable="citation-number" suffix=". "/>
+	<text macro="author"/>
+	<date variable="issued" suffix=".">
+	  <date-part name="year"/>
+	</date>
+	<text variable="title" suffix=". "/>
+	<choose>
+	  <if type="chapter">
+	    <group class="container" delimiter=" ">
+	      <text variable="page" prefix="p. " suffix="."/>
+	      <text term="in" text-case="capitalize-first" font-style="italic"/>
+	      <group delimiter=", ">
+		<text macro="editor"/>
+		<text variable="container-title" />
+		<text variable="collection-title" prefix=" " suffix="."/>
+		<text variable="edition" />
+		<text variable="volume" prefix="vol. " suffix="."/>
+	      </group>
+	      <text macro="publisher"/>
+	    </group>
+	  </if>
+	  <else>
+	    <text variable="container-title" suffix="."/>
+	    <group delimiter=":">
+	      <text variable="volume" font-weight="bold"/>
+	      <text variable="page"/>
+	    </group>
+	  </else>
+	</choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/jbc.csl b/csl/jbc.csl
index 6bc4d33d14..ac099a0eeb 100644
--- a/csl/jbc.csl
+++ b/csl/jbc.csl
@@ -1,143 +1,142 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>Journal of Biological Chemistry</title>
-    <id>http://www.zotero.org/styles/jbc</id>
-    <link>http://www.zotero.org/styles/jbc</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <updated></updated>
-    <summary>Style for Journal of Biological Chemistry</summary>
-    <source>http://www.jbc.org/misc/ifora.shtml#_References</source>
-    <category term="numeric"/>
-    <category term="biology"/>
-  </info>
-  <macro name="editor">
-    <names variable="editor" prefix="(" suffix=")" delimiter=", ">
-      <name and="text" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
-	    delimiter=", "/>
-      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<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="book">
-	    <text variable="title" form="short" font-style="italic"/>
-	  </if>
-	  <else>
-	    <text variable="title" form="short"/>
-	  </else>
-	</choose>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <text term="online" prefix="[" 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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <text variable="citation-number" />
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="6"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix=" "/>
-      <date variable="issued" prefix=" (" suffix=")">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group suffix=",">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " quotes="true"/>
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="lowercase"/>
-	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
-	      <name and="text" sort-separator=", " initialize-with=". "/>
-	      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-	    </names>
-	    <text variable="container-title"  prefix=" " suffix="."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group prefix=", ">
-		<text variable="page"/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=". ">
-	      <text variable="volume" font-weight="bold"/>
-	      <text variable="issue" prefix="(" suffix=")"/>
-	    </group>
-	    <group prefix=", ">
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>Journal of Biological Chemistry</title>
+    <id>http://www.zotero.org/styles/jbc</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <updated></updated>
+    <summary>Style for Journal of Biological Chemistry</summary>
+    <link href="http://www.jbc.org/misc/ifora.shtml#_References" rel="documentation"/>
+    <category term="numeric"/>
+    <category term="biology"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" prefix="(" suffix=")" delimiter=", ">
+      <name and="text" initialize-with=". " delimiter=", "/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
+	    delimiter=", "/>
+      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<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="book">
+	    <text variable="title" form="short" font-style="italic"/>
+	  </if>
+	  <else>
+	    <text variable="title" form="short"/>
+	  </else>
+	</choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text term="online" prefix="[" 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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <text variable="citation-number" />
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="6"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author" suffix=" "/>
+      <date variable="issued" prefix=" (" suffix=")">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group suffix=",">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <text prefix=" " suffix="." macro="publisher"/>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " quotes="true"/>
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="lowercase"/>
+	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
+	      <name and="text" sort-separator=", " initialize-with=". "/>
+	      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+	    </names>
+	    <text variable="container-title"  prefix=" " suffix="."/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group prefix=", ">
+		<text variable="page"/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=". ">
+	      <text variable="volume" font-weight="bold"/>
+	      <text variable="issue" prefix="(" suffix=")"/>
+	    </group>
+	    <group prefix=", ">
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/metabolic-eng.csl b/csl/metabolic-eng.csl
index 5eec6797c0..3405a43151 100644
--- a/csl/metabolic-eng.csl
+++ b/csl/metabolic-eng.csl
@@ -1,181 +1,181 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Metabolic Engineering Journal</title>
-    <id>http://www.zotero.org/styles/metabolic-eng</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="biology"/>
-    <updated/>
-    <summary>The Metabolic Engineering Journal style</summary>
-    <source>http://www.elsevier.com/wps/find/journaldescription.cws_home/622913/authorinstructions</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with="." text-case="capitalize-first"/>
-      <label form="short" text-case="capitalize-first" prefix=" (" suffix=".)" />
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always" initialize-with="."/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", " >
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </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">
-    <label variable="page" suffix=". " form="short"/>
-    <text variable="page"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="3"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=", ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </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" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix=","/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", ">
-	      <group delimiter=" ">
-		<text term="in" text-case="capitalize-first" suffix=":"/>
-		<text macro="editor" suffix=","/>
-		<text variable="container-title" />
-	      </group>
-	      <group delimiter=" ">
-		<text variable="volume" prefix="Vol. " />
-		<text variable="collection-title" />
-		<text macro="series-editor"/>
-	      </group>
-	      <text macro="publisher" prefix=" "/>
-	      <text macro="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" />
-	    <group delimiter=", ">
-	      <text variable="volume" />
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Metabolic Engineering Journal</title>
+    <id>http://www.zotero.org/styles/metabolic-eng</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="biology"/>
+    <updated/>
+    <summary>The Metabolic Engineering Journal style</summary>
+    <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/622913/authorinstructions" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=", " delimiter=", " initialize-with="." text-case="capitalize-first"/>
+      <label form="short" text-case="capitalize-first" prefix=" (" suffix=".)" />
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always" initialize-with="."/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " >
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </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">
+    <label variable="page" suffix=". " form="short"/>
+    <text variable="page"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="3"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=", ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </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" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix=","/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", ">
+	      <group delimiter=" ">
+		<text term="in" text-case="capitalize-first" suffix=":"/>
+		<text macro="editor" suffix=","/>
+		<text variable="container-title" />
+	      </group>
+	      <group delimiter=" ">
+		<text variable="volume" prefix="Vol. " />
+		<text variable="collection-title" />
+		<text macro="series-editor"/>
+	      </group>
+	      <text macro="publisher" prefix=" "/>
+	      <text macro="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" />
+	    <group delimiter=", ">
+	      <text variable="volume" />
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/meteoritics.csl b/csl/meteoritics.csl
index 90acc442e7..d5f732f8d8 100644
--- a/csl/meteoritics.csl
+++ b/csl/meteoritics.csl
@@ -1,191 +1,191 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Meteoritics &amp; Planetary Science Journal</title>
-    <id>http://www.zotero.org/styles/meteoritics</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="astronomy"/>
-    <updated/>
-    <summary>The Meteoritics &amp; Planetary Science Journal style</summary>
-    <source>http://meteoritics.org/Instructions%20for%20authors.htm</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="verb" text-case="lowercase" suffix=" " />
-      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", "
-	    delimiter-precedes-last="always" initialize-with=". "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", "
-	    delimiter-precedes-last="always" initialize-with=". "/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " >
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <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">
-    <label variable="page" suffix=". " form="short"/>
-    <text variable="page"/>
-  </macro>
-  <macro name="pagecount">
-    <text variable="page"/>
-    <label variable="page" prefix=" " suffix="." form="short"/>
-  </macro>
-  <macro name="container">
-    <text term="in" text-case="capitalize-first" suffix=" "/>
-    <text variable="container-title" font-style="italic"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </group>
-      <choose>
-	<if type="article-newspaper article-magazine" match="any">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="container-title" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=". ">
-	    <group delimiter=" ">
-	      <text macro="title" prefix=" " suffix=","/>
-	      <text variable="edition" suffix=" ed."/>
-	      <text macro="editor" suffix="."/>
-	      <text macro="publisher"/>
-	    </group>
-	    <text macro="pagecount"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=". ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=" ">
-	      <group delimiter=", ">
-		<text macro="container"/>
-		<text variable="edition" suffix=" ed."/>
-		<text macro="editor" />
-	      </group>
-	    </group>
-	    <text macro="publisher" prefix=" "/>
-	    <text macro="page"/>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=": ">
-	      <text variable="volume" />
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Meteoritics &amp; Planetary Science Journal</title>
+    <id>http://www.zotero.org/styles/meteoritics</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="astronomy"/>
+    <updated/>
+    <summary>The Meteoritics &amp; Planetary Science Journal style</summary>
+    <link href="http://meteoritics.org/Instructions%20for%20authors.htm" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="verb" text-case="lowercase" suffix=" " />
+      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", "
+	    delimiter-precedes-last="always" initialize-with=". "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="all" sort-separator=" " delimiter=", "
+	    delimiter-precedes-last="always" initialize-with=". "/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " >
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <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">
+    <label variable="page" suffix=". " form="short"/>
+    <text variable="page"/>
+  </macro>
+  <macro name="pagecount">
+    <text variable="page"/>
+    <label variable="page" prefix=" " suffix="." form="short"/>
+  </macro>
+  <macro name="container">
+    <text term="in" text-case="capitalize-first" suffix=" "/>
+    <text variable="container-title" font-style="italic"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </group>
+      <choose>
+	<if type="article-newspaper article-magazine" match="any">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="container-title" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=". ">
+	    <group delimiter=" ">
+	      <text macro="title" prefix=" " suffix=","/>
+	      <text variable="edition" suffix=" ed."/>
+	      <text macro="editor" suffix="."/>
+	      <text macro="publisher"/>
+	    </group>
+	    <text macro="pagecount"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=". ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=" ">
+	      <group delimiter=", ">
+		<text macro="container"/>
+		<text variable="edition" suffix=" ed."/>
+		<text macro="editor" />
+	      </group>
+	    </group>
+	    <text macro="publisher" prefix=" "/>
+	    <text macro="page"/>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <group delimiter=": ">
+	      <text variable="volume" />
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/mhra.csl b/csl/mhra.csl
index a81517a661..65ba9055e5 100644
--- a/csl/mhra.csl
+++ b/csl/mhra.csl
@@ -2,8 +2,7 @@
   <info>
     <title>Modern Humanities Research Association (Note with Bibliography)</title>
     <id>http://www.zotero.org/styles/mhra</id>
-    <link>http://www.zotero.org/styles/mhra</link>
-    <source>http://www.mhra.org.uk/Publications/Books/StyleGuide/download.shtml</source>
+    <link href="http://www.mhra.org.uk/Publications/Books/StyleGuide/download.shtml" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
diff --git a/csl/mhra_note_without_bibliography.csl b/csl/mhra_note_without_bibliography.csl
index 29c9700bd4..69cffb93cd 100644
--- a/csl/mhra_note_without_bibliography.csl
+++ b/csl/mhra_note_without_bibliography.csl
@@ -4,7 +4,6 @@
     <info>
         <title>Modern Humanities Research Association (Note without Bibliography)</title>
         <id>http://www.zotero.org/styles/mhra_note_without_bibliography</id>
-        <link>http://www.zotero.org/styles/mhra_note_without_bibliography</link>
         <summary>Bibliography style for the Modern Humanities Research Association</summary>
         <author>
             <name>Jim Safley</name>
diff --git a/csl/mla.csl b/csl/mla.csl
index 185d21f4af..bb39d34cd6 100644
--- a/csl/mla.csl
+++ b/csl/mla.csl
@@ -4,7 +4,6 @@
   <info>
     <title>Modern Language Association</title>
     <id>http://www.zotero.org/styles/mla</id>
-    <link>http://www.zotero.org/styles/mla</link>
     <author>
       <name>Simon Kornblith</name>
       <email>simon@simonster.com</email>
diff --git a/csl/nature.csl b/csl/nature.csl
index 7bbe6a5a77..1cd71ea440 100644
--- a/csl/nature.csl
+++ b/csl/nature.csl
@@ -4,7 +4,6 @@
     <info>
         <title>Nature Journal</title>
         <id>http://www.zotero.org/styles/nature</id>
-        <link>http://www.zotero.org/styles/nature</link>
         <author>
             <name>Michael Berkowitz</name>
             <email>mberkowi@gmu.edu</email>
diff --git a/csl/neuroreport.csl b/csl/neuroreport.csl
index c408feca53..417c6b643f 100644
--- a/csl/neuroreport.csl
+++ b/csl/neuroreport.csl
@@ -1,82 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>Neuroreport</title>
-    <id>http://www.zotero.org/styles/neuroreport</id>
-    <link>http://www.zotero.org/styles/neuroreport</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="biology"/>
-    <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">
-      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="publisher">
-    <text variable="publisher-place" suffix=": "/>
-    <text variable="publisher" suffix="; "/>
-    <date variable="issued">
-      <date-part name="year" suffix=". "/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout prefix="[" suffix="]" delimiter="; ">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="et-al-min" value="7"/>
-    <option name="et-al-use-first" value="6"/>
-    <option name="second-field-align" value="true"/>
-    <layout>
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <choose>
-	<if type="book">
-	  <text variable="title" suffix=". " font-style="italic"/>
-	  <text variable="edition" prefix=" " suffix=" ed. "/>
-	  <text macro="publisher" prefix=" "/>
-	</if>
-	<else-if type="chapter">
-	  <text variable="title" suffix=". "/>
-	  <group prefix=" In: " delimiter=" " suffix=". ">
-	    <text macro="editor" suffix="."/>
-	    <text variable="container-title" font-style="italic"/>
-	  </group>
-	  <text macro="publisher" prefix=" "/>
-	  <label variable="page" form="short" suffix=". "/>
-	  <text variable="page" suffix="."/>
-	</else-if>
-	<else>
-	  <text variable="title" suffix=". "/>
-	  <group delimiter=" ">
-	    <text variable="container-title" form="short" font-style="italic"/>
-	    <date variable="issued" suffix=";">
-	      <date-part name="year"/>
-	    </date>
-	    <group delimiter=" " suffix=":">
-	      <text variable="volume" font-weight="bold"/>
-	      <text variable="issue" prefix="(" suffix=")" font-weight="bold"/>
-	    </group>
-	    <text variable="page" suffix="."/>
-	  </group>
-	</else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>Neuroreport</title>
+    <id>http://www.zotero.org/styles/neuroreport</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="biology"/>
+    <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">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" text-case="lowercase" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher-place" suffix=": "/>
+    <text variable="publisher" suffix="; "/>
+    <date variable="issued">
+      <date-part name="year" suffix=". "/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="[" suffix="]" delimiter="; ">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="et-al-min" value="7"/>
+    <option name="et-al-use-first" value="6"/>
+    <option name="second-field-align" value="true"/>
+    <layout>
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <choose>
+	<if type="book">
+	  <text variable="title" suffix=". " font-style="italic"/>
+	  <text variable="edition" prefix=" " suffix=" ed. "/>
+	  <text macro="publisher" prefix=" "/>
+	</if>
+	<else-if type="chapter">
+	  <text variable="title" suffix=". "/>
+	  <group prefix=" In: " delimiter=" " suffix=". ">
+	    <text macro="editor" suffix="."/>
+	    <text variable="container-title" font-style="italic"/>
+	  </group>
+	  <text macro="publisher" prefix=" "/>
+	  <label variable="page" form="short" suffix=". "/>
+	  <text variable="page" suffix="."/>
+	</else-if>
+	<else>
+	  <text variable="title" suffix=". "/>
+	  <group delimiter=" ">
+	    <text variable="container-title" form="short" font-style="italic"/>
+	    <date variable="issued" suffix=";">
+	      <date-part name="year"/>
+	    </date>
+	    <group delimiter=" " suffix=":">
+	      <text variable="volume" font-weight="bold"/>
+	      <text variable="issue" prefix="(" suffix=")" font-weight="bold"/>
+	    </group>
+	    <text variable="page" suffix="."/>
+	  </group>
+	</else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/nlm.csl b/csl/nlm.csl
index 19c727c7a2..0fad40edf3 100644
--- a/csl/nlm.csl
+++ b/csl/nlm.csl
@@ -4,7 +4,6 @@
   <info>
     <title>National Library of Medicine</title>
     <id>http://www.zotero.org/styles/nlm</id>
-    <link>http://www.zotero.org/styles/nlm</link>
     <author>
       <name>Michael Berkowitz</name>
       <email>mberkowi@gmu.edu</email>
diff --git a/csl/nuc-acid-res.csl b/csl/nuc-acid-res.csl
index f6ec1b1b68..78aafca469 100644
--- a/csl/nuc-acid-res.csl
+++ b/csl/nuc-acid-res.csl
@@ -1,120 +1,119 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Nucleic Acids Research Journal</title>
-    <id>http://www.zotero.org/styles/nuc-acid-res</id>
-    <link>http://www.zotero.org/styles/nuc-acid-res</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="biology"/>
-    <category term="numeric"/>
-    <updated/>
-    <summary>Nucleic Acids Research Journal style.</summary>
-    <source>http://www.oxfordjournals.org/nar/for_authors/msprep_submission.html</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name  initialize-with="." name-as-sort-order="all" sort-separator=","
-	     delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator="," initialize-with="."
-	    delimiter=", " and="text" delimiter-precedes-last="never"/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text variable="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="cite-date">
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
-      <date-part name="day" suffix=", "/>
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <text variable="citation-number" />
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="11"/>
-    <option name="et-al-use-first" value="1"/>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <text macro="cite-date" prefix=" (" suffix=")"/>
-      <choose>
-	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title"/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	    <text macro="publisher" />
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix=". "/>
-	  <group class="container" prefix=" " delimiter=" " suffix=".">
-	    <text term="in" text-case="capitalize-first"/>
-	    <group delimiter=", ">
-	      <text macro="editor"/>
-	      <text variable="container-title" font-style="italic"/>
-	      <text variable="collection-title" prefix=" " suffix="."/>
-	    </group>
-	  </group>
-	  <group suffix="." delimiter=", ">
-	    <text macro="publisher" prefix=" "/>
-	    <text variable="volume" prefix="Vol. "/>
-	    <group>
-	      <label variable="page" suffix=". " form="short"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" delimiter=", " prefix=" " suffix=".">
-	    <text variable="container-title" form="short" font-style="italic"/>
-	    <text variable="volume" font-weight="bold"/>
-	    <text variable="page"/>
-	    <text variable="DOI"/>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" />
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Nucleic Acids Research Journal</title>
+    <id>http://www.zotero.org/styles/nuc-acid-res</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="biology"/>
+    <category term="numeric"/>
+    <updated/>
+    <summary>Nucleic Acids Research Journal style.</summary>
+    <link href="http://www.oxfordjournals.org/nar/for_authors/msprep_submission.html" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name  initialize-with="." name-as-sort-order="all" sort-separator=","
+	     delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" text-case="lowercase" prefix=" (" suffix=")"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator="," initialize-with="."
+	    delimiter=", " and="text" delimiter-precedes-last="never"/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="cite-date">
+    <date variable="issued">
+      <date-part name="month" suffix=" "/>
+      <date-part name="day" suffix=", "/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <text variable="citation-number" />
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="11"/>
+    <option name="et-al-use-first" value="1"/>
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <text macro="cite-date" prefix=" (" suffix=")"/>
+      <choose>
+	<if type="book">
+	  <group delimiter=" " prefix=" ">
+	    <text macro="title"/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	    <text macro="publisher" />
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix=". "/>
+	  <group class="container" prefix=" " delimiter=" " suffix=".">
+	    <text term="in" text-case="capitalize-first"/>
+	    <group delimiter=", ">
+	      <text macro="editor"/>
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="collection-title" prefix=" " suffix="."/>
+	    </group>
+	  </group>
+	  <group suffix="." delimiter=", ">
+	    <text macro="publisher" prefix=" "/>
+	    <text variable="volume" prefix="Vol. "/>
+	    <group>
+	      <label variable="page" suffix=". " form="short"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" delimiter=", " prefix=" " suffix=".">
+	    <text variable="container-title" form="short" font-style="italic"/>
+	    <text variable="volume" font-weight="bold"/>
+	    <text variable="page"/>
+	    <text variable="DOI"/>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" />
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/ou-harvard.csl b/csl/ou-harvard.csl
index 2e9879e67a..306223f512 100644
--- a/csl/ou-harvard.csl
+++ b/csl/ou-harvard.csl
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Open University Harvard Reference</title>
-    <id>http://www.zotero.org/styles/ou-harvard</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="generic-base"/>
-    <updated></updated>
-    <summary>The Open University Harvard author-date style</summary>
-    <source>http://library.open.ac.uk/research/citastyle/index.cfm</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
-      <label form="short" prefix=" ("  text-case="lowercase" suffix=".)"/>
-    </names>
-  </macro>
-  <macro name="anon">
-    <text term="anonymous" form="short" text-case="capitalize-first"/>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " 
-	    delimiter=", " form="long"/>
-      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text macro="anon"/>
-      </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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if variable="URL">
-	<text term="online" prefix="[" suffix="]"/>
-	<text value=" Available from: " />
-	<text variable="URL"/>
-	<group prefix=" (" delimiter=" " suffix=")">
-	  <text term="accessed" text-case="capitalize-first"/>
-	  <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">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title" quotes="true"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <choose>
-      <if variable="issued">
-	<date variable="issued">
-	  <date-part name="year"/>
-	</date>
-      </if>
-      <else>
-	<text term="no date"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="published-date">
-    <choose>
-      <if type="article-newspaper">
-	<date variable="issued">
-	  <date-part name="day" form="ordinal" suffix=" "/>
-	  <date-part name="month" form="long"/>
-	</date>
-      </if>
-    </choose>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". "/>
-    <text variable="page"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="4"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <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>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="4"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <group delimiter=" " suffix=" ">
-	<text macro="author" />
-	<text macro="year-date" prefix="(" suffix=")"/>
-      </group>
-      <choose>
-	<if type="book">
-	  <group suffix="," delimiter=" ">
-	    <text macro="title"/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	  </group>
-	  <group delimiter=", " prefix=" ">
-	    <text variable="genre"/>
-	    <text prefix=" " suffix="." macro="publisher"/>
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" "/>
-	  <group class="container" prefix=", ">
-	    <text term="in" text-case="lowercase"/>
-	    <text macro="editor" prefix=" " suffix=", "/>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-	    <text variable="collection-title" prefix=" " suffix=","/>
-	    <group suffix="." delimiter=", ">
-	      <text macro="publisher" prefix=" "/>
-	      <text macro="pages"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title" font-style="italic"/>
-	    <group prefix=", "  delimiter=", ">
-	      <group>
-		<text variable="volume" />
-		<text variable="issue" prefix="(" suffix=")"/>
-		<text macro="published-date"/>
-	      </group>
-	      <text macro="pages"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" />
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Open University Harvard Reference</title>
+    <id>http://www.zotero.org/styles/ou-harvard</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="generic-base"/>
+    <updated></updated>
+    <summary>The Open University Harvard author-date style</summary>
+    <link href="http://library.open.ac.uk/research/citastyle/index.cfm" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="text" initialize-with=". " delimiter=", " sort-separator=", " name-as-sort-order="all"/>
+      <label form="short" prefix=" ("  text-case="lowercase" suffix=".)"/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", " 
+	    delimiter=", " form="long"/>
+      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text macro="anon"/>
+      </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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="URL">
+	<text term="online" prefix="[" suffix="]"/>
+	<text value=" Available from: " />
+	<text variable="URL"/>
+	<group prefix=" (" delimiter=" " suffix=")">
+	  <text term="accessed" text-case="capitalize-first"/>
+	  <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">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+	<date variable="issued">
+	  <date-part name="year"/>
+	</date>
+      </if>
+      <else>
+	<text term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="published-date">
+    <choose>
+      <if type="article-newspaper">
+	<date variable="issued">
+	  <date-part name="day" form="ordinal" suffix=" "/>
+	  <date-part name="month" form="long"/>
+	</date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". "/>
+    <text variable="page"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="4"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <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>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="4"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=" " suffix=" ">
+	<text macro="author" />
+	<text macro="year-date" prefix="(" suffix=")"/>
+      </group>
+      <choose>
+	<if type="book">
+	  <group suffix="," delimiter=" ">
+	    <text macro="title"/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	  </group>
+	  <group delimiter=", " prefix=" ">
+	    <text variable="genre"/>
+	    <text prefix=" " suffix="." macro="publisher"/>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" "/>
+	  <group class="container" prefix=", ">
+	    <text term="in" text-case="lowercase"/>
+	    <text macro="editor" prefix=" " suffix=", "/>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+	    <text variable="collection-title" prefix=" " suffix=","/>
+	    <group suffix="." delimiter=", ">
+	      <text macro="publisher" prefix=" "/>
+	      <text macro="pages"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=", "  delimiter=", ">
+	      <group>
+		<text variable="volume" />
+		<text variable="issue" prefix="(" suffix=")"/>
+		<text macro="published-date"/>
+	      </group>
+	      <text macro="pages"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" />
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/oxford-art.csl b/csl/oxford-art.csl
index f4b7ac4fe4..15d0957d95 100644
--- a/csl/oxford-art.csl
+++ b/csl/oxford-art.csl
@@ -2,8 +2,7 @@
   <info>
     <title>Oxford Art Journal</title>
     <id>http://www.zotero.org/styles/oxford-art</id>
-    <link>http://www.zotero.org/styles/oxford-art</link>
-    <source>http://www.oxfordjournals.org/oxartj/for_authors/index.html</source>
+    <link href="http://www.oxfordjournals.org/oxartj/for_authors/index.html" rel="documentation"/>
     <author>
       <name>Julian Onions</name>
       <email>julian.onions@gmail.com</email>
diff --git a/csl/plos.csl b/csl/plos.csl
index ef833593c7..17cf43ec19 100644
--- a/csl/plos.csl
+++ b/csl/plos.csl
@@ -1,121 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Public Library of Science Journal</title>
-    <id>http://www.zotero.org/styles/plos</id>
-    <link>http://www.zotero.org/styles/plos</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="science"/>
-    <updated/>
-    <summary>Public Library of Science Journal style.</summary>
-    <source>http://journals.plos.org/plosbiology/guidelines.php</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
-	     delimiter=", " delimiter-precedes-last="always"/>
-      <label form="long" text-case="lowercase" prefix=" "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text variable="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <text value="Available:" suffix=" "/>
-      <text variable="URL" suffix="."/>
-      <group prefix=" " suffix="">
-	<text term="accessed" text-case="capitalize-first" suffix=" "/>
-	<date variable="accessed">
-	  <date-part name="day" suffix=" "/>
-	  <date-part name="month" suffix=" "/>
-	  <date-part name="year"/>
-	</date>
-      </group>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": ">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="cite-date">
-    <date variable="issued">
-      <date-part name="month" suffix=" "/>
-      <date-part name="day" suffix=", "/>
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout prefix="[" suffix="]" delimiter=",">
-      <text variable="citation-number" />
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="5"/>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <text macro="cite-date" prefix=" (" suffix=")"/>
-      <choose>
-	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title" suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	    <text macro="publisher" />
-	    <text variable="page" suffix=" "/>
-	    <label variable="page" form="short" />
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " suffix=". "/>
-	  <group class="container" prefix=" " delimiter=" " suffix=".">
-	    <text term="in" text-case="capitalize-first" suffix=":"/>
-	    <group delimiter=". ">
-	      <text macro="editor"/>
-	      <text variable="container-title"/>
-	      <text variable="collection-title" prefix=" " suffix="."/>
-	    </group>
-	  </group>
-	  <group suffix="." delimiter=", ">
-	    <text macro="publisher" prefix=" "/>
-	    <text variable="volume" prefix="Vol. "/>
-	    <group>
-	      <label variable="page" suffix=". " form="short"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" delimiter=" " prefix=" " suffix=".">
-	    <text variable="container-title" form="short"/>
-	    <text variable="volume"/>
-	  </group>
-	  <text variable="page" prefix=":"/>
-	  <text variable="DOI"/>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" />
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Public Library of Science Journal</title>
+    <id>http://www.zotero.org/styles/plos</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="science"/>
+    <updated/>
+    <summary>Public Library of Science Journal style.</summary>
+    <link href="http://journals.plos.org/plosbiology/guidelines.php" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
+	     delimiter=", " delimiter-precedes-last="always"/>
+      <label form="long" text-case="lowercase" prefix=" "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text value="Available:" suffix=" "/>
+      <text variable="URL" suffix="."/>
+      <group prefix=" " suffix="">
+	<text term="accessed" text-case="capitalize-first" suffix=" "/>
+	<date variable="accessed">
+	  <date-part name="day" suffix=" "/>
+	  <date-part name="month" suffix=" "/>
+	  <date-part name="year"/>
+	</date>
+      </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="cite-date">
+    <date variable="issued">
+      <date-part name="month" suffix=" "/>
+      <date-part name="day" suffix=", "/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout prefix="[" suffix="]" delimiter=",">
+      <text variable="citation-number" />
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="5"/>
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <text macro="cite-date" prefix=" (" suffix=")"/>
+      <choose>
+	<if type="book">
+	  <group delimiter=" " prefix=" ">
+	    <text macro="title" suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	    <text macro="publisher" />
+	    <text variable="page" suffix=" "/>
+	    <label variable="page" form="short" />
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " suffix=". "/>
+	  <group class="container" prefix=" " delimiter=" " suffix=".">
+	    <text term="in" text-case="capitalize-first" suffix=":"/>
+	    <group delimiter=". ">
+	      <text macro="editor"/>
+	      <text variable="container-title"/>
+	      <text variable="collection-title" prefix=" " suffix="."/>
+	    </group>
+	  </group>
+	  <group suffix="." delimiter=", ">
+	    <text macro="publisher" prefix=" "/>
+	    <text variable="volume" prefix="Vol. "/>
+	    <group>
+	      <label variable="page" suffix=". " form="short"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" delimiter=" " prefix=" " suffix=".">
+	    <text variable="container-title" form="short"/>
+	    <text variable="volume"/>
+	  </group>
+	  <text variable="page" prefix=":"/>
+	  <text variable="DOI"/>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" />
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/pnas.csl b/csl/pnas.csl
index f72593eecd..a35025a6f0 100644
--- a/csl/pnas.csl
+++ b/csl/pnas.csl
@@ -1,119 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>PNAS Journal</title>
-    <id>http://www.zotero.org/styles/pnas</id>
-    <link>http://www.zotero.org/styles/pnas</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="science"/>
-    <updated/>
-    <summary>The Proceedings of the National Academy of Sciences Journal style.</summary>
-    <source>http://www.pnas.org/misc/iforc.shtml</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" delimiter=", ">
-      <label form="short" prefix="" text-case="lowercase" suffix=" "/>
-      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
-	     delimiter=", " delimiter-precedes-last="always"/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
-	    delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<text variable="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <group prefix="(" delimiter=": " suffix=")">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
-  </macro>
-  <macro name="year-date">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout prefix="(" suffix=")" delimiter=", ">
-      <text variable="citation-number" />
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="5"/>
-    <option name="et-al-use-first" value="1"/>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author"/>
-      <date variable="issued" prefix=" (" suffix=")">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group delimiter=" " prefix=" ">
-	    <text macro="title"/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" />
-	    <text macro="publisher" />
-	  </group>
-	</if>
-	<else-if type="chapter">
-	  <group class="container" prefix=" " delimiter=" ">
-	    <text term="in" text-case="lowercase"/>
-	    <group delimiter=", ">
-	      <text variable="container-title" font-style="italic"/>
-	      <text variable="collection-title" prefix=" " suffix="."/>
-	      <text macro="editor"/>
-	    </group>
-	  </group>
-	  <group suffix=".">
-	    <text macro="publisher" prefix=" "/>
-	    <group prefix=", ">
-	      <label variable="page" suffix=". " form="short"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group class="container" delimiter=":" prefix=" " suffix=".">
-	    <group delimiter=" ">
-	      <text variable="container-title" form="short" font-style="italic"/>
-	      <text variable="volume" />
-	    </group>
-	    <text variable="page"/>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" />
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>PNAS Journal</title>
+    <id>http://www.zotero.org/styles/pnas</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="science"/>
+    <updated/>
+    <summary>The Proceedings of the National Academy of Sciences Journal style.</summary>
+    <link href="http://www.pnas.org/misc/iforc.shtml" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="short" prefix="" text-case="lowercase" suffix=" "/>
+      <name  initialize-with="" name-as-sort-order="all" sort-separator=" "
+	     delimiter=", " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with=""
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" " suffix="." text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <text variable="title"/>
+  </macro>
+  <macro name="publisher">
+    <group prefix="(" delimiter=": " suffix=")">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout prefix="(" suffix=")" delimiter=", ">
+      <text variable="citation-number" />
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="5"/>
+    <option name="et-al-use-first" value="1"/>
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <date variable="issued" prefix=" (" suffix=")">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group delimiter=" " prefix=" ">
+	    <text macro="title"/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" />
+	    <text macro="publisher" />
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <group class="container" prefix=" " delimiter=" ">
+	    <text term="in" text-case="lowercase"/>
+	    <group delimiter=", ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="collection-title" prefix=" " suffix="."/>
+	      <text macro="editor"/>
+	    </group>
+	  </group>
+	  <group suffix=".">
+	    <text macro="publisher" prefix=" "/>
+	    <group prefix=", ">
+	      <label variable="page" suffix=". " form="short"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group class="container" delimiter=":" prefix=" " suffix=".">
+	    <group delimiter=" ">
+	      <text variable="container-title" form="short" font-style="italic"/>
+	      <text variable="volume" />
+	    </group>
+	    <text variable="page"/>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" />
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/rna.csl b/csl/rna.csl
index ce3b701040..b65205a591 100644
--- a/csl/rna.csl
+++ b/csl/rna.csl
@@ -1,192 +1,192 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>RNA Journal</title>
-    <id>http://www.zotero.org/styles/rna</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="biology"/>
-    <category term="author-date"/>
-    <updated/>
-    <summary>The RNA Journal style</summary>
-    <source>http://www.rnajournal.org/misc/ifora.shtml</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="short" text-case="lowercase" suffix=". " />
-      <name and="text" delimiter=", " initialize-with="." text-case="capitalize-first"/>
-    </names>
-  </macro>
-  <macro name="series-editor">
-    <names variable="original-author">
-      <label form="short" text-case="capitalize-first" suffix=". "/>
-      <name and="text" delimiter=", "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", "
-	    delimiter-precedes-last="always" initialize-with="."/>
-      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
-      <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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", " >
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </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">
-      <label variable="page" suffix=". " form="short"/>
-      <text variable="page"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </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" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=", ">
-	      <group delimiter=" ">
-		<text term="in" text-case="capitalize-first"/>
-		<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 macro="page"/>
-	      <text macro="publisher" prefix=" "/>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=" ">
-	    <text variable="container-title" font-style="italic"/>
-	    <group delimiter=": ">
-	      <text variable="volume" font-weight="bold"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>RNA Journal</title>
+    <id>http://www.zotero.org/styles/rna</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="biology"/>
+    <category term="author-date"/>
+    <updated/>
+    <summary>The RNA Journal style</summary>
+    <link href="http://www.rnajournal.org/misc/ifora.shtml" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="lowercase" suffix=". " />
+      <name and="text" delimiter=", " initialize-with="." text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-case="capitalize-first" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", "
+	    delimiter-precedes-last="always" initialize-with="."/>
+      <label form="short" prefix=", " suffix="." text-case="lowercase"/>
+      <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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", " >
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </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">
+      <label variable="page" suffix=". " form="short"/>
+      <text variable="page"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </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" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=", ">
+	      <group delimiter=" ">
+		<text term="in" text-case="capitalize-first"/>
+		<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 macro="page"/>
+	      <text macro="publisher" prefix=" "/>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <group delimiter=": ">
+	      <text variable="volume" font-weight="bold"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/ro-humanities.csl b/csl/ro-humanities.csl
index 1a8903de76..5b77b43aaa 100644
--- a/csl/ro-humanities.csl
+++ b/csl/ro-humanities.csl
@@ -1,379 +1,378 @@
-<?oxygen RNGSchema="http://xbiblio.svn.sourceforge.net/viewvc/*checkout*/xbiblio/csl/schema/trunk/csl.rnc" type="compact"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="ro">
-    <info>
-        <title>Romanian Humanities</title>
-        <id>http://www.zotero.org/styles/ro-humanities</id>
-        <link>https://www.zotero.org/svn/extension/trunk/csl/ro-humanities.csl</link>
-        <author>
-            <name>Nicolae Turcan</name>
-            <email>nicturcan@gmail.com</email>
-        </author>
-        <category term="humanities"/>
-        <category term="generic-base"/>
-        <category term="author-date"/>
-        <updated>2007-11-28T10:10:10</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="long" delimiter="; " delimiter-precedes-last="always" sort-separator=", "/>
-            <label form="short" prefix=" (" suffix=".)"/>
-            <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="long" delimiter="; "
-                delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
-            <label form="short" prefix=" (" suffix=".)"/>
-            <substitute>
-                <names variable="editor" font-variant="small-caps"/>
-                <names variable="translator" font-variant="small-caps"/>
-                <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="at" suffix=" "/>
-                <text variable="URL"/>
-            </group>
-        </group>
-    </macro>
-    <macro name="title">
-        <choose>
-            <if type="book">
-                <text variable="title" text-case="sentence" font-style="italic"/>
-            </if>
-            <else>
-                <text variable="title" text-case="sentence" prefix="&#8222;"
-                    suffix="&#8221;"/>
-            </else>
-        </choose>
-    </macro>
-    <macro name="title-short">
-        <choose>
-            <if type="book">
-                <text variable="title" text-case="sentence" font-style="italic" form="short"/>
-            </if>
-            <else>
-                <text variable="title" text-case="sentence" prefix="&#8222;"
-                    suffix="&#8221;" form="short"/>
-            </else>
-        </choose>
-    </macro>
-    <macro name="publisher">
-        <group delimiter=", ">
-            <text variable="publisher"/>
-            <text variable="publisher-place"/>
-        </group>
-    </macro>
-    <citation>
-        <option name="et-al-min" value="6"/>
-        <option name="et-al-use-first" value="1"/>
-        <option name="et-al-subsequent-min" value="3"/>
-        <option name="et-al-subsequent-use-first" value="1"/>
-        <option name="collapse" value="year"/>
-        <sort>
-            <key macro="author"/>
-            <key variable="issued"/>
-        </sort>
-        <layout suffix=".">
-            <choose>
-                <if position="first">
-                    <choose>
-                        <if type="book">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <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" include-period="true"
-                                        text-case="lowercase"/>
-                                    <text variable="volume"/>
-                                </group>
-                                <text macro="editor-translator"/>
-                                <text variable="edition"/>
-                                <text macro="publisher"/>
-                                <date variable="issued">
-                                    <date-part name="year"/>
-                                </date>
-                                <group>
-                                    <label variable="locator" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                                <text macro="access"/>
-                            </group>
-                        </if>
-                        <else-if type="chapter">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <text macro="title"/>
-                                <group delimiter=" " class="container">
-                                    <text term="in"/>
-                                    <names variable="editor translator" delimiter=", ">
-                                        <name sort-separator=", "/>
-                                        <label form="short" prefix="(" suffix=".)"
-                                            text-case="lowercase"/>
-                                    </names>
-                                    <text variable="container-title" font-style="italic"/>
-                                </group>
-                                <group delimiter=" ">
-                                    <text term="volume" form="short" include-period="true"
-                                        text-case="lowercase"/>
-                                    <text variable="volume"/>
-                                </group>
-                                <text macro="editor-translator"/>
-                                <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" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                                <text macro="access"/>
-                            </group>
-                        </else-if>
-                        <else-if type="article">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <text macro="title"/>
-                                <text variable="container-title" font-style="italic"/>
-                                <group delimiter=" ">
-                                    <text term="volume" form="short" include-period="true"
-                                        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" 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"/>
-                                <text macro="editor-translator"/>
-                                <group class="containter-title" delimiter=", ">
-                                    <text variable="container-title" font-style="italic"/>
-                                    <group delimiter=" ">
-                                        <text term="volume" form="short" include-period="true"
-                                            text-case="lowercase"/>
-                                        <text variable="volume"/>
-                                    </group>
-                                    <text variable="issue"/>
-                                </group>
-                                <group>
-                                    <label variable="locator" include-period="true" 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" include-period="true" 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="book">
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <text macro="title-short"/>
-                                <group delimiter=" ">
-                                    <text term="volume" form="short" include-period="true"
-                                        text-case="lowercase"/>
-                                    <text variable="volume"/>
-                                </group>
-                                <group>
-                                    <label variable="locator" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                            </group>
-                        </if>
-                        <else>
-                            <group delimiter=", ">
-                                <text macro="author"/>
-                                <text macro="title-short"/>
-                                <group>
-                                    <label variable="locator" include-period="true" form="short"/>
-                                    <text variable="locator" prefix=" "/>
-                                </group>
-                            </group>
-                        </else>
-                    </choose>
-                </else-if>
-            </choose>
-        </layout>
-    </citation>
-    <bibliography>
-        <option name="hanging-indent" value="true"/>
-        <option name="et-al-min" value="6"/>
-        <option name="et-al-use-first" value="6"/>
-        <sort>
-            <key macro="author-bibliography"/>
-            <key variable="title"/>
-        </sort>
-        <layout suffix=".">
-            <text macro="author-bibliography" suffix=", "/>
-            <choose>
-                <if type="book">
-                    <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" include-period="true"
-                                text-case="lowercase"/>
-                            <text variable="volume"/>
-                        </group>
-                        <text macro="editor-translator"/>
-                        <text variable="edition"/>
-                        <text macro="publisher"/>
-                        <date variable="issued">
-                            <date-part name="year"/>
-                        </date>
-                        <group>
-                            <label variable="page" include-period="true" form="short"/>
-                            <text variable="page" prefix=" "/>
-                        </group>
-                    </group>
-                </if>
-                <else-if type="chapter">
-                    <group delimiter=", ">
-                        <text macro="title"/>
-                        <group delimiter=" " class="container">
-                            <text term="in"/>
-                            <names variable="editor translator" delimiter=", ">
-                                <name sort-separator=", "/>
-                                <label form="short" prefix="(" suffix=".)" text-case="lowercase"/>
-                            </names>
-                            <text variable="container-title" font-style="italic"/>
-                        </group>
-                        <group delimiter=" ">
-                            <text term="volume" form="short" include-period="true"
-                                text-case="lowercase"/>
-                            <text variable="volume"/>
-                        </group>
-                        <text macro="editor-translator"/>
-                        <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" include-period="true" form="short"/>
-                            <text variable="page" prefix=" "/>
-                        </group>
-                    </group>
-                </else-if>
-                <else-if type="article">
-                    <group delimiter=", ">
-                        <text macro="title"/>
-                        <text variable="container-title" font-style="italic"/>
-                        <group delimiter=" ">
-                            <text term="volume" form="short" include-period="true"
-                                text-case="lowercase"/>
-                            <text variable="volume"/>
-                        </group>
-                        <group delimiter=" ">
-                            <text term="issue" form="short" include-period="true" text-case="lowercase"/>
-                            <text variable="issue"/>
-                        </group>                        
-                        <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="page" include-period="true" form="short"/>
-                            <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" include-period="true"
-                                text-case="lowercase"/>
-                            <text variable="volume"/>
-                        </group>
-                        <group>
-                            <text term="issue" form="short" include-period="true" text-case="lowercase"/>
-                            <text variable="issue"/>
-                        </group>
-                        <group>
-                            <label variable="page" include-period="true" form="short"/>
-                            <text variable="page" prefix=" "/>
-                        </group>
-                    </group>
-                </else>
-            </choose>
-            <text prefix=", " macro="access"/>
-        </layout>
-    </bibliography>
-</style>
+<?oxygen RNGSchema="http://xbiblio.svn.sourceforge.net/viewvc/*checkout*/xbiblio/csl/schema/trunk/csl.rnc" type="compact"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="ro">
+    <info>
+        <title>Romanian Humanities</title>
+        <id>http://www.zotero.org/styles/ro-humanities</id>
+        <author>
+            <name>Nicolae Turcan</name>
+            <email>nicturcan@gmail.com</email>
+        </author>
+        <category term="humanities"/>
+        <category term="generic-base"/>
+        <category term="author-date"/>
+        <updated>2007-11-28T10:10:10</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="long" delimiter="; " delimiter-precedes-last="always" sort-separator=", "/>
+            <label form="short" prefix=" (" suffix=".)"/>
+            <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="long" delimiter="; "
+                delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
+            <label form="short" prefix=" (" suffix=".)"/>
+            <substitute>
+                <names variable="editor" font-variant="small-caps"/>
+                <names variable="translator" font-variant="small-caps"/>
+                <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="at" suffix=" "/>
+                <text variable="URL"/>
+            </group>
+        </group>
+    </macro>
+    <macro name="title">
+        <choose>
+            <if type="book">
+                <text variable="title" text-case="sentence" font-style="italic"/>
+            </if>
+            <else>
+                <text variable="title" text-case="sentence" prefix="&#8222;"
+                    suffix="&#8221;"/>
+            </else>
+        </choose>
+    </macro>
+    <macro name="title-short">
+        <choose>
+            <if type="book">
+                <text variable="title" text-case="sentence" font-style="italic" form="short"/>
+            </if>
+            <else>
+                <text variable="title" text-case="sentence" prefix="&#8222;"
+                    suffix="&#8221;" form="short"/>
+            </else>
+        </choose>
+    </macro>
+    <macro name="publisher">
+        <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="publisher-place"/>
+        </group>
+    </macro>
+    <citation>
+        <option name="et-al-min" value="6"/>
+        <option name="et-al-use-first" value="1"/>
+        <option name="et-al-subsequent-min" value="3"/>
+        <option name="et-al-subsequent-use-first" value="1"/>
+        <option name="collapse" value="year"/>
+        <sort>
+            <key macro="author"/>
+            <key variable="issued"/>
+        </sort>
+        <layout suffix=".">
+            <choose>
+                <if position="first">
+                    <choose>
+                        <if type="book">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <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" include-period="true"
+                                        text-case="lowercase"/>
+                                    <text variable="volume"/>
+                                </group>
+                                <text macro="editor-translator"/>
+                                <text variable="edition"/>
+                                <text macro="publisher"/>
+                                <date variable="issued">
+                                    <date-part name="year"/>
+                                </date>
+                                <group>
+                                    <label variable="locator" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                                <text macro="access"/>
+                            </group>
+                        </if>
+                        <else-if type="chapter">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <text macro="title"/>
+                                <group delimiter=" " class="container">
+                                    <text term="in"/>
+                                    <names variable="editor translator" delimiter=", ">
+                                        <name sort-separator=", "/>
+                                        <label form="short" prefix="(" suffix=".)"
+                                            text-case="lowercase"/>
+                                    </names>
+                                    <text variable="container-title" font-style="italic"/>
+                                </group>
+                                <group delimiter=" ">
+                                    <text term="volume" form="short" include-period="true"
+                                        text-case="lowercase"/>
+                                    <text variable="volume"/>
+                                </group>
+                                <text macro="editor-translator"/>
+                                <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" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                                <text macro="access"/>
+                            </group>
+                        </else-if>
+                        <else-if type="article">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <text macro="title"/>
+                                <text variable="container-title" font-style="italic"/>
+                                <group delimiter=" ">
+                                    <text term="volume" form="short" include-period="true"
+                                        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" 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"/>
+                                <text macro="editor-translator"/>
+                                <group class="containter-title" delimiter=", ">
+                                    <text variable="container-title" font-style="italic"/>
+                                    <group delimiter=" ">
+                                        <text term="volume" form="short" include-period="true"
+                                            text-case="lowercase"/>
+                                        <text variable="volume"/>
+                                    </group>
+                                    <text variable="issue"/>
+                                </group>
+                                <group>
+                                    <label variable="locator" include-period="true" 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" include-period="true" 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="book">
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <text macro="title-short"/>
+                                <group delimiter=" ">
+                                    <text term="volume" form="short" include-period="true"
+                                        text-case="lowercase"/>
+                                    <text variable="volume"/>
+                                </group>
+                                <group>
+                                    <label variable="locator" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                            </group>
+                        </if>
+                        <else>
+                            <group delimiter=", ">
+                                <text macro="author"/>
+                                <text macro="title-short"/>
+                                <group>
+                                    <label variable="locator" include-period="true" form="short"/>
+                                    <text variable="locator" prefix=" "/>
+                                </group>
+                            </group>
+                        </else>
+                    </choose>
+                </else-if>
+            </choose>
+        </layout>
+    </citation>
+    <bibliography>
+        <option name="hanging-indent" value="true"/>
+        <option name="et-al-min" value="6"/>
+        <option name="et-al-use-first" value="6"/>
+        <sort>
+            <key macro="author-bibliography"/>
+            <key variable="title"/>
+        </sort>
+        <layout suffix=".">
+            <text macro="author-bibliography" suffix=", "/>
+            <choose>
+                <if type="book">
+                    <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" include-period="true"
+                                text-case="lowercase"/>
+                            <text variable="volume"/>
+                        </group>
+                        <text macro="editor-translator"/>
+                        <text variable="edition"/>
+                        <text macro="publisher"/>
+                        <date variable="issued">
+                            <date-part name="year"/>
+                        </date>
+                        <group>
+                            <label variable="page" include-period="true" form="short"/>
+                            <text variable="page" prefix=" "/>
+                        </group>
+                    </group>
+                </if>
+                <else-if type="chapter">
+                    <group delimiter=", ">
+                        <text macro="title"/>
+                        <group delimiter=" " class="container">
+                            <text term="in"/>
+                            <names variable="editor translator" delimiter=", ">
+                                <name sort-separator=", "/>
+                                <label form="short" prefix="(" suffix=".)" text-case="lowercase"/>
+                            </names>
+                            <text variable="container-title" font-style="italic"/>
+                        </group>
+                        <group delimiter=" ">
+                            <text term="volume" form="short" include-period="true"
+                                text-case="lowercase"/>
+                            <text variable="volume"/>
+                        </group>
+                        <text macro="editor-translator"/>
+                        <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" include-period="true" form="short"/>
+                            <text variable="page" prefix=" "/>
+                        </group>
+                    </group>
+                </else-if>
+                <else-if type="article">
+                    <group delimiter=", ">
+                        <text macro="title"/>
+                        <text variable="container-title" font-style="italic"/>
+                        <group delimiter=" ">
+                            <text term="volume" form="short" include-period="true"
+                                text-case="lowercase"/>
+                            <text variable="volume"/>
+                        </group>
+                        <group delimiter=" ">
+                            <text term="issue" form="short" include-period="true" text-case="lowercase"/>
+                            <text variable="issue"/>
+                        </group>                        
+                        <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="page" include-period="true" form="short"/>
+                            <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" include-period="true"
+                                text-case="lowercase"/>
+                            <text variable="volume"/>
+                        </group>
+                        <group>
+                            <text term="issue" form="short" include-period="true" text-case="lowercase"/>
+                            <text variable="issue"/>
+                        </group>
+                        <group>
+                            <label variable="page" include-period="true" form="short"/>
+                            <text variable="page" prefix=" "/>
+                        </group>
+                    </group>
+                </else>
+            </choose>
+            <text prefix=", " macro="access"/>
+        </layout>
+    </bibliography>
+</style>
diff --git a/csl/royal-society-chemistry.csl b/csl/royal-society-chemistry.csl
index c68bc19f75..f904f02c0c 100644
--- a/csl/royal-society-chemistry.csl
+++ b/csl/royal-society-chemistry.csl
@@ -1,121 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Royal Society of Chemistry general format</title>
-    <id>http://www.zotero.org/styles/royal-society-chemistry</id>
-    <link>http://www.zotero.org/styles/royal-society-chemistry</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="chemistry"/>
-    <updated/>
-    <summary>The Royal Society of Chemistry journal style.</summary>
-    <source>http://www.rsc.org/Publishing/ReSourCe/AuthorGuidelines/ArticleLayout/sect4.asp</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <label form="short" text-case="lowercase" suffix=". " />
-      <name  initialize-with=". " and="text" delimiter=", " />
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name  initialize-with=". " and="text" delimiter=", " />
-      <label form="short" prefix=", " suffix="." text-case="capitalize-first"/>
-      <substitute>
-	<names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <text variable="URL"/>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="volume">
-    <text variable="volume" prefix="vol. "/>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". "/>
-    <text variable="page"/>
-  </macro>
-  <macro name="book-container">
-    <group delimiter=", ">
-      <group delimiter=" ">
-	<text term="in" text-case="lowercase"/>
-	<text variable="container-title" font-style="italic"/>
-      </group>
-      <text macro="editor"/>
-    </group>
-  </macro>
-  <macro name="issued">
-    <date variable="issued" delimiter=" ">
-      <date-part name="year"/>
-    </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout delimiter=", " vertical-align="sup">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="second-field-align" value="margin"/>
-    <layout suffix=".">
-      <text variable="citation-number" />
-      <text macro="author" suffix=", "/>
-      <choose>
-	<if type="thesis">
-	  <group delimiter=", ">
-	    <text variable="genre"/>
-	    <text variable="publisher"/>
-	    <text macro="issued"/>
-	  </group>
-	</if>
-	<else-if type="book">
-	  <text macro="title" suffix=", "/>
-	  <group delimiter=", ">
-	    <text macro="publisher"/>
-	    <text variable="edition" suffix=" edn."/>
-	    <text macro="issued"/>
-	    <text variable="volume" prefix="vol. "/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=", ">
-	    <text macro="book-container"/>
-	    <text macro="publisher" />
-	    <text variable="edition" suffix=" edn."/>
-	    <text macro="issued"/>
-	    <text variable="volume" prefix="vol. "/>
-	    <text macro="pages"/>
-	  </group>
-	</else-if>
-	<else>
-	  <group delimiter=", ">
-	    <text variable="container-title" form="short" font-style="italic"/>
-	    <text macro="issued"/>
-	    <text variable="volume"/>
-	    <text variable="page" />
-	  </group>
-	</else>
-      </choose>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Royal Society of Chemistry general format</title>
+    <id>http://www.zotero.org/styles/royal-society-chemistry</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="chemistry"/>
+    <updated/>
+    <summary>The Royal Society of Chemistry journal style.</summary>
+    <link href="http://www.rsc.org/Publishing/ReSourCe/AuthorGuidelines/ArticleLayout/sect4.asp" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-case="lowercase" suffix=". " />
+      <name  initialize-with=". " and="text" delimiter=", " />
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name  initialize-with=". " and="text" delimiter=", " />
+      <label form="short" prefix=", " suffix="." text-case="capitalize-first"/>
+      <substitute>
+	<names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <text variable="URL"/>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <text variable="volume" prefix="vol. "/>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="book-container">
+    <group delimiter=", ">
+      <group delimiter=" ">
+	<text term="in" text-case="lowercase"/>
+	<text variable="container-title" font-style="italic"/>
+      </group>
+      <text macro="editor"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout delimiter=", " vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="second-field-align" value="margin"/>
+    <layout suffix=".">
+      <text variable="citation-number" />
+      <text macro="author" suffix=", "/>
+      <choose>
+	<if type="thesis">
+	  <group delimiter=", ">
+	    <text variable="genre"/>
+	    <text variable="publisher"/>
+	    <text macro="issued"/>
+	  </group>
+	</if>
+	<else-if type="book">
+	  <text macro="title" suffix=", "/>
+	  <group delimiter=", ">
+	    <text macro="publisher"/>
+	    <text variable="edition" suffix=" edn."/>
+	    <text macro="issued"/>
+	    <text variable="volume" prefix="vol. "/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=", ">
+	    <text macro="book-container"/>
+	    <text macro="publisher" />
+	    <text variable="edition" suffix=" edn."/>
+	    <text macro="issued"/>
+	    <text variable="volume" prefix="vol. "/>
+	    <text macro="pages"/>
+	  </group>
+	</else-if>
+	<else>
+	  <group delimiter=", ">
+	    <text variable="container-title" form="short" font-style="italic"/>
+	    <text macro="issued"/>
+	    <text variable="volume"/>
+	    <text variable="page" />
+	  </group>
+	</else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/science.csl b/csl/science.csl
index 8f13dc6ee4..ff225ff62c 100644
--- a/csl/science.csl
+++ b/csl/science.csl
@@ -1,127 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Science journal</title>
-    <id>http://www.zotero.org/styles/science</id>
-    <link>http://www.zotero.org/styles/science</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="numeric"/>
-    <category term="science"/>
-    <updated/>
-    <summary>The Science journal style.</summary>
-    <source>http://www.sciencemag.org/about/authors/prep/res/refs.dtl</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor" prefix="" suffix="" delimiter=", ">
-      <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name  sort-separator=", " initialize-with=". "
-	     delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=", " suffix="." text-case="capitalize-first"/>
-      <substitute>
-	<names variable="editor"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <text variable="URL"/>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<text variable="title" font-style="italic"/>
-      </if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=", ">
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </macro>
-  <macro name="volume">
-     <text variable="volume" prefix="vol. "/>
-  </macro>
-  <macro name="pages">
-    <label variable="page" form="short" suffix=". "/>
-    <text variable="page"/>
-  </macro>
-  <macro name="issued">
-	      <date variable="issued" delimiter=" ">
-		<date-part name="month" form="long" suffix=" "/>
-		<date-part name="year"/>
-	      </date>
-  </macro>
-  <citation>
-    <option name="collapse" value="citation-number"/>
-    <layout prefix="(" suffix=")" delimiter=", " font-style="italic">
-      <text variable="citation-number" />
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="false"/>
-    <option name="et-al-min" value="5"/>
-    <option name="et-al-use-first" value="1"/>
-    <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
-      <text macro="author" suffix=", "/>
-      <choose>
-	<if type="thesis">
-	  <text value="thesis, "/>
-	  <text macro="publisher"/>
-	  <text macro="issued" prefix=" (" suffix=")"/>
-	</if>
-	<else-if type="book">
-	  <group>
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group prefix=" (" suffix=")" delimiter=", ">
-	    <text macro="publisher"/>
-	    <text variable="edition"/>
-	    <text macro="issued"/>
-	  </group>
-	  <text macro="pages" prefix=", "/>
-	</else-if>
-	<else-if type="chapter">
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="lowercase"/>
-	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <text macro="editor" prefix=" "/>
-	    <group prefix=" (" suffix=")" delimiter=", ">
-	      <text macro="publisher" />
-	      <text macro="issued"/>
-	    </group>
-	  </group>
-	  <group delimiter=", " prefix=", ">
-	    <text macro="volume"/>
-	    <text macro="pages"/>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" ">
-	    <text variable="container-title" font-style="italic" suffix=". "/>
-	    <text variable="volume" font-weight="bold"/>
-	    <text variable="page" prefix=", "/>
-	  </group>
- 	  <text macro="issued" prefix=" (" suffix=")"/>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Science journal</title>
+    <id>http://www.zotero.org/styles/science</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="numeric"/>
+    <category term="science"/>
+    <updated/>
+    <summary>The Science journal style.</summary>
+    <link href="http://www.sciencemag.org/about/authors/prep/res/refs.dtl" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" prefix="" suffix="" delimiter=", ">
+      <name initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name  sort-separator=", " initialize-with=". "
+	     delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="." text-case="capitalize-first"/>
+      <substitute>
+	<names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <text variable="URL"/>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="volume">
+     <text variable="volume" prefix="vol. "/>
+  </macro>
+  <macro name="pages">
+    <label variable="page" form="short" suffix=". "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="issued">
+	      <date variable="issued" delimiter=" ">
+		<date-part name="month" form="long" suffix=" "/>
+		<date-part name="year"/>
+	      </date>
+  </macro>
+  <citation>
+    <option name="collapse" value="citation-number"/>
+    <layout prefix="(" suffix=")" delimiter=", " font-style="italic">
+      <text variable="citation-number" />
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="false"/>
+    <option name="et-al-min" value="5"/>
+    <option name="et-al-use-first" value="1"/>
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author" suffix=", "/>
+      <choose>
+	<if type="thesis">
+	  <text value="thesis, "/>
+	  <text macro="publisher"/>
+	  <text macro="issued" prefix=" (" suffix=")"/>
+	</if>
+	<else-if type="book">
+	  <group>
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group prefix=" (" suffix=")" delimiter=", ">
+	    <text macro="publisher"/>
+	    <text variable="edition"/>
+	    <text macro="issued"/>
+	  </group>
+	  <text macro="pages" prefix=", "/>
+	</else-if>
+	<else-if type="chapter">
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="lowercase"/>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <text macro="editor" prefix=" "/>
+	    <group prefix=" (" suffix=")" delimiter=", ">
+	      <text macro="publisher" />
+	      <text macro="issued"/>
+	    </group>
+	  </group>
+	  <group delimiter=", " prefix=", ">
+	    <text macro="volume"/>
+	    <text macro="pages"/>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" ">
+	    <text variable="container-title" font-style="italic" suffix=". "/>
+	    <text variable="volume" font-weight="bold"/>
+	    <text variable="page" prefix=", "/>
+	  </group>
+ 	  <text macro="issued" prefix=" (" suffix=")"/>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/waterresearch.csl b/csl/waterresearch.csl
index 1e2d73608b..1936cea88a 100644
--- a/csl/waterresearch.csl
+++ b/csl/waterresearch.csl
@@ -1,161 +1,160 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
-  <info>
-    <title>Water Research</title>
-    <id>http://www.zotero.org/styles/waterresearch</id>
-    <link>http://www.zotero.org/styles/waterresearch</link>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <updated></updated>
-    <summary>Style for Water Research.</summary>
-    <source>http://www.elsevier.com/wps/find/journaldescription.cws_home/309/authorinstructions?navopenmenu=4</source>
-    <category label="Water Research" term="author-date"/>
-    <category term="engineering"/>
-  </info>
-  <macro name="editor">
-    <names variable="editor" prefix="(" suffix=")" delimiter=", ">
-      <name and="text" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
-	    delimiter=", "/>
-      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-      <substitute>
-	<names variable="editor"/>
-	<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="book">
-	    <text variable="title" form="short" font-style="italic"/>
-	  </if>
-	  <else>
-	    <text variable="title" form="short"/>
-	  </else>
-	</choose>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <text term="online" suffix="] " prefix="["/>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book">
-	<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>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="6"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="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"/>
-	  <text variable="locator" prefix=" "/>
-	</group>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="6"/>
-    <option name="et-al-use-first" value="6"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout>
-      <text macro="author" suffix=" "/>
-      <date variable="issued" prefix=" (" suffix=")">
-	<date-part name="year"/>
-      </date>
-      <choose>
-	<if type="book">
-	  <group suffix=",">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <text prefix=" " suffix="." macro="publisher"/>
-	</if>
-	<else-if type="chapter">
-	  <text macro="title" prefix=" " quotes="true"/>
-	  <group class="container" prefix=" ">
-	    <text term="in" text-case="lowercase"/>
-	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
-	      <name and="text" sort-separator=", " initialize-with=". "/>
-	      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
-	    </names>
-	    <text variable="container-title"  prefix=" " suffix="."/>
-	    <text variable="collection-title" prefix=" " suffix="."/>
-	    <group suffix=".">
-	      <text macro="publisher" prefix=" "/>
-	      <group prefix=", ">
-		<text variable="page"/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix=".">
-	    <text macro="title" prefix=" "/>
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix=".">
-	    <text variable="container-title"/>
-	    <group prefix=", ">
-	      <text variable="volume" />
-	      <text variable="issue" prefix="(" suffix=")"/>
-	    </group>
-	    <group prefix=", ">
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" xml:lang="en">
+  <info>
+    <title>Water Research</title>
+    <id>http://www.zotero.org/styles/waterresearch</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <updated></updated>
+    <summary>Style for Water Research.</summary>
+    <link href="http://www.elsevier.com/wps/find/journaldescription.cws_home/309/authorinstructions?navopenmenu=4" rel="documentation"/>
+    <category label="Water Research" term="author-date"/>
+    <category term="engineering"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor" prefix="(" suffix=")" delimiter=", ">
+      <name and="text" initialize-with=". " delimiter=", "/>
+      <label form="short" prefix=", " text-case="lowercase" suffix="."/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". "
+	    delimiter=", "/>
+      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+      <substitute>
+	<names variable="editor"/>
+	<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="book">
+	    <text variable="title" form="short" font-style="italic"/>
+	  </if>
+	  <else>
+	    <text variable="title" form="short"/>
+	  </else>
+	</choose>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text term="online" suffix="] " prefix="["/>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<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>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="6"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="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"/>
+	  <text variable="locator" prefix=" "/>
+	</group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="6"/>
+    <option name="et-al-use-first" value="6"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <text macro="author" suffix=" "/>
+      <date variable="issued" prefix=" (" suffix=")">
+	<date-part name="year"/>
+      </date>
+      <choose>
+	<if type="book">
+	  <group suffix=",">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <text prefix=" " suffix="." macro="publisher"/>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" " quotes="true"/>
+	  <group class="container" prefix=" ">
+	    <text term="in" text-case="lowercase"/>
+	    <names variable="editor" prefix=" " suffix="," delimiter=", ">
+	      <name and="text" sort-separator=", " initialize-with=". "/>
+	      <label form="short" prefix=" (" suffix=".)" text-case="lowercase"/>
+	    </names>
+	    <text variable="container-title"  prefix=" " suffix="."/>
+	    <text variable="collection-title" prefix=" " suffix="."/>
+	    <group suffix=".">
+	      <text macro="publisher" prefix=" "/>
+	      <group prefix=", ">
+		<text variable="page"/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix=".">
+	    <text variable="container-title"/>
+	    <group prefix=", ">
+	      <text variable="volume" />
+	      <text variable="issue" prefix="(" suffix=")"/>
+	    </group>
+	    <group prefix=", ">
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/csl/yeast.csl b/csl/yeast.csl
index 8c2ff9a820..0c8aadfa6a 100644
--- a/csl/yeast.csl
+++ b/csl/yeast.csl
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
-  <info>
-    <title>Yeast Journal</title>
-    <id>http://www.zotero.org/styles/yeast</id>
-    <author>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </author>
-    <category term="author-date"/>
-    <category term="biology"/>
-    <updated/>
-    <summary>The Yeast Journal style</summary>
-    <source>http://www3.interscience.wiley.com/cgi-bin/jabout/3895/ForAuthors.html?CRETRY=1%26SRETRY=0</source>
-  </info>
-  <macro name="editor">
-    <names variable="editor">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", " 
-	    delimiter-precedes-last="always" initialize-with=""/>
-      <label form="short" text-case="lowercase" prefix=". (" suffix=")" />
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" sort-separator=" " delimiter=", "
-	    delimiter-precedes-last="always" initialize-with=""/>
-      <label form="short" prefix=". (" suffix=")." text-case="lowercase"/>
-      <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"/>
-	<text macro="anon"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group>
-      <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>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="thesis">
-	<text variable="title"/>
-      </if>
-      <else-if type="book">
-	<text variable="title" font-style="italic"/>
-      </else-if>
-      <else>
-	<text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <group delimiter=": " >
-      <text variable="publisher"/>
-      <text variable="publisher-place"/>
-    </group>
-  </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"/>
-  </macro>
-  <citation>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <option name="et-al-subsequent-min" value="6"/>
-    <option name="et-al-subsequent-use-first" value="1"/>
-    <option name="disambiguate-add-year-suffix" value="true"/>
-    <option name="disambiguate-add-names" value="true"/>
-    <option name="disambiguate-add-givenname" value="true"/>
-    <option name="collapse" value="year"/>
-    <layout prefix="[" suffix="]" delimiter="; ">
-      <group delimiter=", ">
-	<group delimiter=" ">
-	  <text macro="author-short"/>
-	  <text macro="year-date"/>
-	</group>
-	<text variable="locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography>
-    <option name="hanging-indent" value="true"/>
-    <option name="et-al-min" value="10"/>
-    <option name="et-al-use-first" value="1"/>
-    <sort>
-      <key macro="author"/>
-      <key variable="title"/>
-    </sort>
-    <layout suffix=".">
-      <group delimiter=" ">
-	<text macro="author" suffix="."/>
-	<text macro="year-date" suffix="."/>
-      </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" font-style="italic"/>
-	    <text macro="day-month"/>
-	    <text variable="edition"/>
-	  </group>
-	</if>
-	<else-if type="thesis">
-	  <text macro="title" prefix=" " suffix="."/>
-	  <group prefix=" " delimiter=", ">
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text variable="genre"/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="book">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <text variable="edition" suffix=" ed."/>
-	    <text macro="editor" suffix="."/>
-	    <text macro="publisher"/>
-	  </group>
-	</else-if>
-	<else-if type="chapter">
-	  <group delimiter=" ">
-	    <text macro="title" prefix=" " suffix="."/>
-	    <group class="container" delimiter=" " >
-	      <group delimiter=" " suffix=".">
-		<text term="in" text-case="capitalize-first"/>
-		<text variable="container-title" font-style="italic" suffix=","/>
-		<text macro="editor"/>
-	      </group>
-	      <group delimiter="; ">
-		<text macro="publisher"/>
-		<text macro="page"/>
-	      </group>
-	    </group>
-	  </group>
-	</else-if>
-	<else>
-	  <group suffix="." >
-	    <text macro="title" prefix=" " />
-	    <text macro="editor" prefix=" "/>
-	  </group>
-	  <group class="container" prefix=" " suffix="." delimiter=", ">
-	    <text variable="container-title" form="short" font-style="italic"/>
-	    <group delimiter=": ">
-	      <text variable="volume" font-weight="bold"/>
-	      <text variable="page"/>
-	    </group>
-	  </group>
-	</else>
-      </choose>
-      <text prefix=" " macro="access" suffix="."/>
-    </layout>
-  </bibliography>
-</style>
+<?xml version="1.0" encoding="UTF-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" xml:lang="en" class="in-text" >
+  <info>
+    <title>Yeast Journal</title>
+    <id>http://www.zotero.org/styles/yeast</id>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="author-date"/>
+    <category term="biology"/>
+    <updated/>
+    <summary>The Yeast Journal style</summary>
+    <link href="http://www3.interscience.wiley.com/cgi-bin/jabout/3895/ForAuthors.html?CRETRY=1%26SRETRY=0" rel="documentation"/>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " delimiter=", " 
+	    delimiter-precedes-last="always" initialize-with=""/>
+      <label form="short" text-case="lowercase" prefix=". (" suffix=")" />
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " delimiter=", "
+	    delimiter-precedes-last="always" initialize-with=""/>
+      <label form="short" prefix=". (" suffix=")." text-case="lowercase"/>
+      <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"/>
+	<text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <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>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="thesis">
+	<text variable="title"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": " >
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </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"/>
+  </macro>
+  <citation>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <option name="et-al-subsequent-min" value="6"/>
+    <option name="et-al-subsequent-use-first" value="1"/>
+    <option name="disambiguate-add-year-suffix" value="true"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <option name="collapse" value="year"/>
+    <layout prefix="[" suffix="]" delimiter="; ">
+      <group delimiter=", ">
+	<group delimiter=" ">
+	  <text macro="author-short"/>
+	  <text macro="year-date"/>
+	</group>
+	<text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <option name="hanging-indent" value="true"/>
+    <option name="et-al-min" value="10"/>
+    <option name="et-al-use-first" value="1"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=" ">
+	<text macro="author" suffix="."/>
+	<text macro="year-date" suffix="."/>
+      </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" font-style="italic"/>
+	    <text macro="day-month"/>
+	    <text variable="edition"/>
+	  </group>
+	</if>
+	<else-if type="thesis">
+	  <text macro="title" prefix=" " suffix="."/>
+	  <group prefix=" " delimiter=", ">
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text variable="genre"/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <text variable="edition" suffix=" ed."/>
+	    <text macro="editor" suffix="."/>
+	    <text macro="publisher"/>
+	  </group>
+	</else-if>
+	<else-if type="chapter">
+	  <group delimiter=" ">
+	    <text macro="title" prefix=" " suffix="."/>
+	    <group class="container" delimiter=" " >
+	      <group delimiter=" " suffix=".">
+		<text term="in" text-case="capitalize-first"/>
+		<text variable="container-title" font-style="italic" suffix=","/>
+		<text macro="editor"/>
+	      </group>
+	      <group delimiter="; ">
+		<text macro="publisher"/>
+		<text macro="page"/>
+	      </group>
+	    </group>
+	  </group>
+	</else-if>
+	<else>
+	  <group suffix="." >
+	    <text macro="title" prefix=" " />
+	    <text macro="editor" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="." delimiter=", ">
+	    <text variable="container-title" form="short" font-style="italic"/>
+	    <group delimiter=": ">
+	      <text variable="volume" font-weight="bold"/>
+	      <text variable="page"/>
+	    </group>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access" suffix="."/>
+    </layout>
+  </bibliography>
+</style>