diff --git a/csl/chicago-author-date.csl b/csl/chicago-author-date.csl
index 3ff98c925..c00d9b12d 100644
--- a/csl/chicago-author-date.csl
+++ b/csl/chicago-author-date.csl
@@ -1,175 +1,194 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="author-date" xml:lang="en">
-	<info>
-		<title>Chicago Manual of Style (Author-Date)</title>
-		<id>http://www.zotero.org/styles/chicago-author-date</id>
-		<author>
-			<name>Simon Kornblith</name>
-			<email>simon@simonster.com</email>
-		</author>
-		<updated></updated>
-		<summary>The author-date variant of the Chicago style.</summary>
-	</info>
-	<defaults>
-		<contributor name-as-sort-order="no">
-			<label form="verb-short" suffix=". "/>
-			<name and="text" delimiter=", "/>
-		</contributor>
-		<author name-as-sort-order="first">
-			<name and="text" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
-			<label form="short" prefix=", " suffix="."/>
-			<substitute>
-				<choose>
-					<editor/>
-					<translator/>
-					<titles relation="container" font-style="italic"/>
-					<titles/>
-				</choose>
-			</substitute>
-		</author>
-		<locator>
-			<number/>
-		</locator>
-		<identifier>
-			<number/>
-		</identifier>
-		<titles>
-			<title/>
-		</titles>
-		<date>
-			<year/>
-		</date>
-		<access>
-			<url/>
-			<date prefix=" (" suffix=")">
-				<text term-name="accessed" suffix=" "/>
-				<month suffix=" " text-transform="capitalize"/>
-				<day suffix=", "/>
-				<year/>
-			</date>
-		</access>
-	</defaults>
-	<citation prefix="(" suffix=")" delimiter="; ">
-		<et-al min-authors="3" use-first="1"/>
-		<layout>
-			<item>
-				<group delimiter=" ">
-					<author form="short">
-						<name and="text" delimiter=", "/>
-					</author>
-					<group>
-						<date/>
-						<locator prefix=", "/>
-					</group>
-				</group>
-			</item>
-		</layout>
-	</citation>
-	<bibliography hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;">
-		<sort algorithm="author-date"/>
-		<et-al min-authors="6" use-first="6"/>
-		<layout>
-			<list>
-				<heading>
-					<text term-name="works cited"/>
-				</heading>
-			</list>
-			<item suffix=".">
-				<choose>
-					<type name="book">
-						<author suffix="."/>
-						<conditional>
-							<if field="date">
-								<date prefix=" " suffix="."/>
-							</if><else>
-								<text term-name="no date" text-transform="capitalize" prefix=" " suffix="."/>
-							</else>
-						</conditional>
-						<titles prefix=" " suffix="." font-style="italic"/>
-						<group prefix=" " suffix="." delimiter=", " text-transform="capitalize">
-							<editor/>
-							<translator/>
-						</group>
-						<group prefix=" " suffix="." delimiter=": ">
-							<publisher><place/></publisher>
-							<publisher><name/></publisher>
-						</group>
-						<access prefix=" "/>
-					</type>
-					<type name="chapter">
-						<author suffix="."/>
-						<conditional>
-							<if field="date">
-								<date prefix=" " suffix="."/>
-							</if><else>
-								<text term-name="no date" text-transform="capitalize" prefix=" " suffix="."/>
-							</else>
-						</conditional>
-						<titles prefix=" " suffix="."/>
-						<group class="container" suffix=".">
-							<text prefix=" " term-name="in" text-transform="capitalize"/>
-							<titles prefix=" " relation="container" font-style="italic"/>
-							<editor prefix=", "/>
-							<translator prefix=", "/>
-							<pages prefix=", "/>
-							<group prefix=". " delimiter=": ">
-								<publisher><place/></publisher>
-								<publisher><name/></publisher>
-							</group>
-						</group>
-						<access prefix=" "/>
-					</type>
-					<type name="article">
-						<author suffix="."/>
-						<date prefix=" " suffix="."/>
-						<titles prefix=" " suffix="."/>
-						<group prefix=" " suffix="." delimiter=", " text-transform="capitalize">
-							<editor/>
-							<translator/>
-						</group>
-						<group class="container" prefix=" " suffix="." delimiter=", ">
-							<titles relation="container" font-style="italic"/>
-							<date>
-								<month text-transform="capitalize"/>
-								<day prefix=" "/>
-							</date>
-						</group>
-						<access prefix=" "/>
-					</type>
-					<type name="article-journal">
-						<author suffix="."/>
-						<date prefix=" " suffix="."/>
-						<titles prefix=" " suffix="."/>
-						<group prefix=" " suffix="." delimiter=", " text-transform="capitalize">
-							<editor/>
-							<translator/>
-						</group>
-						<group class="container" prefix=" " suffix=".">
-							<titles relation="container" font-style="italic"/>
-							<volume prefix=" "/>						
-							<conditional>
-								<if field="issue">
-									<conditional>
-										<if field="date">
-											<issue prefix=", no. "/>
-											<date prefix=" (" suffix=")">
-												<month text-transform="capitalize"/>
-												<day prefix=" "/>
-											</date>
-										</if><else>
-											<issue prefix=" (" suffix=")"/>
-										</else>
-									</conditional>
-									<pages prefix=": "/>
-								</if><else>
-									<pages prefix=":"/>
-								</else>
-							</conditional>
-						</group>
-						<access prefix=" "/>
-					</type>
-				</choose>
-			</item>
-		</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"/>
+    <updated/>
+    <summary>The chicago author-date style.</summary>
+    <source>http://www.chicagomanualofstyle.org/tools_citationguide.html</source>
+  </info>
+  <macro name="editor">
+    <names variable="editor">
+      <label form="short" text-transform="capitalize" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="series-editor">
+    <names variable="original-author">
+      <label form="short" text-transform="capitalize" suffix=". "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text value="Anon"/>
+  </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-transform="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-transform="capitalize" 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-transform="capitalize"/>
+		<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/mhra.csl b/csl/mhra.csl
new file mode 100644
index 000000000..17a1ebb2b
--- /dev/null
+++ b/csl/mhra.csl
@@ -0,0 +1,316 @@
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en"> 
+  <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>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <category term="history"/>
+    <category term="generic-base"/>
+    <updated/>
+  </info>
+  <macro name="editor-translator">
+    <names variable="editor translator" prefix="" suffix="" delimiter=", ">
+      <label form="verb-short" prefix=" " text-transform="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="editor-translator-short">
+    <names variable="editor translator" prefix="" suffix="" delimiter=", ">
+      <label form="short" prefix=" " text-transform="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="."/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="title"/>
+      </substitute>
+    </names>
+  </macro> 
+  <macro name="author-full">
+    <names variable="author">
+      <name name-as-sort-order="all" and="text" sort-separator=", "
+	    delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", " suffix="."/>
+      <substitute>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="long" and="text" delimiter=", " />
+      <label form="short" prefix=", " suffix="."/>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <text variable="URL"/>
+      <group prefix=" (" suffix=")" delimiter=" ">
+	<text term="accessed" text-transform="lowercase" suffix=" "/>
+	<date variable="accessed" suffix=", ">
+	  <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" form="long" quotes="true"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" form="long" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title" form="long" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal" match="none">
+	<label variable="page" form="short" suffix=". "/>
+      </if>
+    </choose>
+    <text variable="page"/>
+  </macro>
+  <macro name="locator">
+    <label variable="locator" form="short" suffix=". "/>
+    <text variable="locator"/>
+  </macro>
+  <macro name="vols">
+    <choose>
+      <if variable="number-of-volumes">
+	<text variable="number-of-volumes"/>
+	<text term="volume" prefix=" " form="short" plural="true"/>
+      </if>
+    </choose>
+  </macro>
+  <citation>
+    <layout suffix="." delimiter="; ">
+      <group suffix="">       
+	<text macro="author-short" suffix=", "/>
+	<text macro="title" prefix=""/>
+	<choose>
+	  <if type="thesis">
+	    <group prefix=" (" delimiter=", " suffix=")">
+	      <text variable="genre"/>
+	      <text variable="publisher"/>
+	      <date variable="issued">
+		<date-part name="year"/>
+	      </date>
+	    </group>
+	  </if>
+	  <else-if type="chapter">
+	    <group class="container" prefix=", ">
+	      <text term="in" text-transform="lowercase"/>
+	      <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+	      <text variable="collection-title" prefix=" " suffix=","/>
+	      <text macro="editor-translator-short"/>
+	    </group>
+	    <group prefix=" (" suffix=")" delimiter=", ">
+	      <text macro="publisher" />
+	      <date variable="issued">
+		<date-part name="year"/>
+	      </date>
+	    </group>
+	  </else-if>
+	  <else-if type="book">
+	    <group delimiter=", " prefix=" ">
+	      <text macro="editor-translator-short"/>
+	      <text variable="collection-title"/>
+	      <text variable="edition" suffix=" edn"/>
+	      <text macro="vols"/>
+	    </group>
+	    <group prefix=" (" suffix=")" delimiter=", ">
+	      <text macro="publisher"/>
+	      <date variable="issued" prefix=" " suffix="">
+		<date-part name="year"/>
+	      </date>
+	    </group>
+	    <text variable="volume" prefix=", "/>
+	  </else-if>
+	  <else-if type="article-newspaper article-magazine" match="any">
+	    <group delimiter=", " prefix=", ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="issue"  suffix="."/>
+	      <date variable="issued">
+		<date-part name="day" form="numeric" suffix=" "/>
+		<date-part name="month" form="long" suffix=" "/>
+		<date-part name="year"/>
+	      </date>          
+	    </group>
+	  </else-if>
+	  <else-if type="article-journal">
+	    <group class="container" prefix=", " delimiter=", ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text macro="publisher"/>
+	      <text variable="volume"  prefix=" "/>
+	    </group>
+	    <date variable="issued" prefix=" (" suffix=")">
+	      <date-part name="year"/>
+	    </date>
+	  </else-if>
+	  <else>
+	    <group delimiter=", " prefix=". ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="issue"  prefix=", " suffix="."/>
+	      <date variable="issued">
+		<date-part name="month" form="long"/>
+		<date-part name="day" form="numeric" prefix=" " suffix=", "/>
+		<date-part name="year"/>
+	      </date>          
+	    </group>
+	  </else>
+	</choose>
+	<group prefix=", " delimiter=" ">
+	  <text macro="pages"/>
+	  <text macro="locator" prefix="(" suffix=")"/>
+	</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"/>
+    <option name="subsequent-author-substitute" value="---"/>
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author" suffix=","/>
+      <choose>
+	<if type="thesis">
+	  <group suffix=".">
+	    <text macro="title" prefix=" "/>
+	  </group>
+	  <group delimiter=", " prefix=" ">
+	    <text variable="genre"/>
+	    <text variable="publisher"/>
+	    <date variable="issued">
+	      <date-part name="year"/>
+	    </date>
+	  </group>
+	</if>
+	<else-if type="chapter">
+	  <text macro="title" prefix=" "/>
+	  <group class="container" prefix=", ">
+	    <text term="in" text-transform="lowercase"/>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+	    <text variable="collection-title" prefix=" " suffix=","/>
+	    <text macro="editor-translator-short"/>
+	  </group>
+	  <group prefix=" (" suffix=")" delimiter=", ">
+	    <text macro="publisher" />
+	    <date variable="issued">
+	      <date-part name="year"/>
+	    </date>
+	  </group>
+	</else-if>
+	<else-if type="article-journal">
+	  <group suffix=".">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor-translator" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="">
+	    <text variable="container-title" font-style="italic" prefix=" "/>
+	    <text variable="volume"  prefix=" "/>
+	    <text variable="issue" prefix=", no. "/>
+	    <date variable="issued" prefix=" (" suffix=")">
+	      <date-part name="month" suffix=" "/>
+	      <date-part name="day" suffix=", "/>
+	      <date-part name="year"/>
+	    </date>
+	    <text variable="page" prefix=": "/>
+	  </group>
+	</else-if>
+	<else-if type="article-newspaper article-magazine" match="any">
+	  <group suffix=".">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor-translator" prefix=" "/>
+	  </group>
+	  <group delimiter=", " prefix=" ">
+	    <text variable="container-title" font-style="italic"/>
+	    <text variable="issue"  suffix="."/>
+	    <date variable="issued">
+	      <date-part name="month" form="long"/>
+	      <date-part name="day" form="numeric" prefix=" " suffix=", "/>
+	      <date-part name="year"/>
+	    </date>          
+	  </group>
+	</else-if>
+	<else-if type="paper-conference">
+	  <group suffix=".">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor-translator" prefix=" "/>
+	  </group>
+	  <group suffix="">
+	    <text value="paper presented at" text-transform="capitalize"/>
+	    <text variable="event" prefix=" "/>
+	    <text variable="event-place"  prefix=", "/>
+	    <date variable="event">
+	      <date-part name="month" form="long"/>
+	      <date-part name="day" form="numeric" prefix=" " suffix=", "/>
+	      <date-part name="year"/>
+	    </date>          
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group suffix=".">
+	    <text macro="title" prefix=" " suffix="."/>
+	  </group>
+	  <group delimiter=", " prefix=" ">
+	    <text macro="editor-translator-short"/>
+	    <text variable="collection-title"/>
+	    <text variable="edition" suffix=" edn"/>
+	    <text macro="vols"/>
+	  </group>
+	  <group prefix=" (" suffix=")" delimiter=", ">
+	    <text macro="publisher"/>
+	    <date variable="issued" prefix=" " suffix="">
+	      <date-part name="year"/>
+	    </date>
+	  </group>
+	  <text variable="volume" prefix=", "/>
+	</else-if>
+	<else>
+	  <group suffix=".">
+	    <text macro="title" prefix=" "/>
+	    <text macro="editor-translator" prefix=" "/>
+	  </group>
+	  <group class="container" prefix=" " suffix="">
+	    <text variable="container-title" font-style="italic"/>
+	    <group prefix=", ">
+	      <text variable="volume" font-style="italic"/>
+	      <text variable="issue" prefix="(" suffix=")"/>
+	    </group>
+	    <text variable="page" prefix=", "/>
+	  </group>
+	</else>
+      </choose>
+      <text prefix=" " macro="access"/>
+    </layout>
+  </bibliography>
+</style>