diff --git a/csl/chicago-note-bibliography.csl b/csl/chicago-note-bibliography.csl
index efffef3b2..9c808267e 100644
--- a/csl/chicago-note-bibliography.csl
+++ b/csl/chicago-note-bibliography.csl
@@ -1,189 +1,275 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
-	<info>
-		<title>Chicago Manual of Style (Note with Reference List)</title>
-		<id>http://www.zotero.org/styles/chicago-note-bibliography</id>
-		<author>
-			<name>Simon Kornblith</name>
-			<email>simon@simonster.com</email>
-		</author>
-		<updated></updated>
-		<summary>The note-with-bibliography variant of the Chicago style.</summary>
-	</info>
-	<defaults>
-		<contributor name-as-sort-order="no">
-			<label form="verb" 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>
-			<month suffix=" " text-transform="capitalize"/>
-			<day suffix=", "/>
-			<year/>
-		</date>
-		<access>
-			<url/>
-			<date prefix=" (" suffix=")">
-				<text term-name="accessed" suffix=" "/>
-				<month suffix=" " text-transform="capitalize"/>
-				<day suffix=", "/>
-				<year/>
-			</date>
-		</access>
-	</defaults>
-	<citation suffix="." delimiter="; ">
-		<et-al min-authors="3" use-first="1"/>
-		<layout>
-			<item suffix=".">
-				<group delimiter=", ">
-					<author form="short">
-						<name and="text" sort-separator=", " delimiter=", "/>
-					</author>
-					<conditional>
-						<if type="book">
-							<titles font-style="italic" form="short"/>
-						</if><else>
-							<titles quotes="true" form="short"/>
-						</else>
-					</conditional>
-					<pages/>
-				</group>
-			</item>
-			<item suffix="." position="subsequent" ibid="true">
-				<group delimiter=", ">
-					<author form="short">
-						<name and="text" sort-separator=", " delimiter=", "/>
-					</author>
-					<conditional>
-						<if type="book">
-							<titles font-style="italic" form="short"/>
-						</if><else>
-							<titles quotes="true" form="short"/>
-						</else>
-					</conditional>
-					<pages/>
-				</group>
-			</item>
-		</layout>
-	</citation>
-	<bibliography hanging-indent="true" subsequent-author-substitute="&#8212;&#8212;&#8212;">
-		<sort>
-			<author name-as-sort-order="all"/>
-			<titles/>
-		</sort>
-		<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="."/>
-						<titles prefix=" " suffix="." font-style="italic"/>
-						<group prefix=" " suffix="." delimiter=", " text-transform="capitalize">
-							<editor/>
-							<translator/>
-						</group>
-						<group prefix=" " suffix="." delimiter=", " text-transform="capitalize">
-              				<group delimiter=": ">
-            					<publisher><place/></publisher>
-            					<publisher><name/></publisher>
-              				</group>	
-							<conditional>
-								<if field="date">
-									<date><year/></date>
-								</if><else>
-									<text term-name="no date"/>
-								</else>
-							</conditional>
-						</group>
-						<access prefix=" "/>
-					</type>
-					<type name="chapter">
-						<author suffix="."/>
-						<titles prefix=" " suffix="." quotes="true"/>
-						<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=", ">
-              					<group delimiter=": ">
-            						<publisher><place/></publisher>
-            						<publisher><name/></publisher>
-              					</group>	
-								<conditional>
-									<if field="date">
-										<date><year/></date>
-									</if><else>
-										<text term-name="no date"/>
-									</else>
-								</conditional>
-							</group>
-						</group>
-						<access prefix=" "/>
-					</type>
-					<type name="article">
-						<author suffix="."/>
-						<titles prefix=" " quotes="true"/>
-						<group prefix=" " suffix="." delimiter=", " text-transform="capitalize">
-							<editor/>
-							<translator/>
-						</group>
-						<group class="container" prefix=" " suffix="." delimiter=", ">
-							<titles prefix=" " relation="container" font-style="italic"/>
-							<date/>
-						</group>
-						<access prefix=" "/>
-					</type>
-					<type name="article-journal">
-						<author suffix="."/>
-						<titles prefix=" " suffix="." quotes="true"/>
-						<group prefix=" " suffix="." delimiter=", " text-transform="capitalize">
-							<editor/>
-							<translator/>
-						</group>
-						<group class="container" prefix=" " suffix=".">
-							<titles relation="container" font-style="italic"/>
-							<volume prefix=" "/>			
-							<issue prefix=", no. "/>
-							<conditional>
-								<if field="date">
-									<date prefix=" (" suffix=")"/>	
-									<pages prefix=": "/>
-								</if><else>
-									<pages prefix=":"/>
-								</else>
-							</conditional>
-						</group>
-						<access prefix=" "/>
-					</type>
-				</choose>
-			</item>
-		</layout>
-	</bibliography>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en"> 
+  <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>
+    <author>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
+    </author>
+    <contributor>
+      <name>Simon Kornblith</name>
+      <email>simon@simonster.com</email> 
+    </contributor>
+    <summary>Chicago format with short notes and full bibliography</summary>
+    <category term="generic-base"/>
+    <updated/>
+  </info>
+  <macro name="editor-translator">
+    <names variable="editor translator" prefix="" suffix="" delimiter=", ">
+      <label form="verb" prefix=" " text-transform="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="editor-translator-short">
+    <choose>
+      <if variable="author">
+	<names variable="editor translator" prefix="" suffix="" delimiter=", ">
+	  <label form="short" prefix=" " text-transform="lowercase" suffix=". "/>
+	  <name and="text" delimiter=", "/>
+	</names>
+      </if>
+    </choose>
+  </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="short" and="text" delimiter=", " />
+      <label form="short" prefix=", " suffix="."/>
+      <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" quotes="true"/>
+	  </else>
+	</choose>
+      </substitute>
+    </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="short" quotes="true"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </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="4"/>
+    <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 suffix="">       
+	<text macro="author-short" suffix=", "/>
+	<text macro="title" prefix=""/>
+	<choose>
+	  <if type="thesis">
+	    <group prefix=" (" delimiter=", " suffix=")">
+	      <text variable="genre"/>
+	    </group>
+	  </if>
+	  <else-if type="chapter book" match="any">
+	    <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=","/>
+	    </group>
+	    <text macro="editor-translator-short"/>
+	  </else-if>
+	  <else-if type="article-journal">
+	    <group class="container" prefix=" ">
+	      <text variable="container-title" font-style="italic" prefix=" "/>
+	      <text macro="publisher"/>
+	      <text variable="volume"  prefix=" "/>
+	      <text variable="issue" prefix=", no. "/>
+	      <date variable="issued" prefix=" (" suffix=")">
+		<date-part name="year"/>
+	      </date>
+	      <text variable="page" prefix=": "/>
+	    </group>
+	  </else-if>
+	  <else>
+	    <group delimiter=", " prefix=". ">
+	      <text variable="container-title" font-style="italic"/>
+	      <text variable="issue"  prefix=", " suffix="."/>
+	    </group>
+	  </else>
+	</choose>
+	<text variable="locator" prefix=", "/>
+      </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="---"/>
+    <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="capitalize"/>
+	    <text variable="container-title" font-style="italic" prefix=" " suffix=","/>
+	    <text variable="collection-title" prefix=" " suffix=","/>
+	    <names variable="editor translator" prefix=" " suffix="," delimiter=", ">
+	      <label form="verb" text-transform="lowercase" suffix=" "/>
+	      <name and="text" sort-separator=", " />
+	    </names>
+	    <group suffix=".">
+	      <text variable="page" prefix=" "/>
+	    </group>
+	    <group>
+	      <text macro="publisher" prefix=" "/>
+	      <date variable="issued" prefix=", ">
+		<date-part name="year"/>
+	      </date>
+	    </group>
+	  </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="."/>
+	    <text macro="editor-translator" prefix=""/>
+	  </group>
+	  <text prefix=" " suffix="," macro="publisher"/>
+	  <date variable="issued" prefix=" " suffix="">
+	    <date-part name="year"/>
+	  </date>
+	</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>
diff --git a/csl/chicago-note.csl b/csl/chicago-note.csl
index bdac25f92..959ab8f16 100644
--- a/csl/chicago-note.csl
+++ b/csl/chicago-note.csl
@@ -1,160 +1,173 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en"> 
   <info>
-    <title>Chicago Manual of Style (Note without Reference List)</title>
+    <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>
     <author>
-      <name>Bruce D’Arcus</name>
-      <email>bdarcus@sourceforge.net</email>
+      <name>Julian Onions</name>
+      <email>julian.onions@gmail.com</email>
     </author>
     <contributor>
       <name>Simon Kornblith</name>
-      <email>simon@simonster.com</email>
+      <email>simon@simonster.com</email> 
     </contributor>
-    <contributor>
-      <name>Johan Kool</name>
-      <email>johankool@users.sourceforge.net</email>
-    </contributor>
-    <updated></updated>
-    <summary>The note-without-bibliography variant of the Chicago style.</summary>
+    <summary>Chicago format with full notes and no bibliography</summary>
+    <category term="generic-base"/>
+    <updated/>
   </info>
-  <defaults>
-    <contributor>
-      <label form="short" suffix=". " text-transform="lowercase"/>
+  <macro name="editor-translator">
+    <names variable="editor translator" prefix="" suffix="" delimiter=", ">
+      <label form="verb" prefix=" " text-transform="lowercase" suffix=" "/>
       <name and="text" delimiter=", "/>
-    </contributor>
-    <author>
-      <name and="text" delimiter=", "/>
-      <label form="short" prefix=", " suffix="." text-transform="lowercase"/>
+    </names>
+  </macro>
+  <macro name="editor-translator-short">
+    <choose>
+      <if variable="author">
+	<names variable="editor translator" prefix="" suffix="" delimiter=", ">
+	  <label form="short" prefix=" " text-transform="lowercase" suffix=". "/>
+	  <name and="text" delimiter=", "/>
+	</names>
+      </if>
+    </choose>
+  </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>
-        <choose>
-          <editor/>
-          <translator/>
-        </choose>
+	<names variable="editor"/>
+	<names variable="translator"/>
+	<text macro="title"/>
       </substitute>
-    </author>
-    <locator>
-      <number/>
-    </locator>
-    <titles>
-      <title/>
-    </titles>
-    <date>
-      <month suffix=" " text-transform="capitalize"/>
-      <day suffix=", "/>
-      <year/>
-    </date>
-    <access>
-      <url/>
-      <date prefix=" (" suffix=")">
-        <text term-name="accessed" suffix=" "/>
-        <month suffix=" " text-transform="capitalize"/>
-        <day suffix=", "/>
-        <year/>
-      </date>
-    </access>
-  </defaults>
-  <citation suffix="." delimiter="; ">
-    <et-al min-authors="4" use-first="1"/>
-    <layout>
-      <item>
-        <choose>
-          <type name="book">
-            <group delimiter=", ">
-              <author/>
-              <titles font-style="italic"/>
-              <editor/>
-              <translator/>
-            </group>
-            <group prefix=" (" suffix=")" delimiter=", ">
-              <group delimiter=": ">
-            	<publisher><place/></publisher>
-            	<publisher><name/></publisher>
-              </group>
-			  <conditional>
-				<if field="date">
-					<date><year/></date>
-				</if><else>
-					<text term-name="no date"/>
-				</else>
-			  </conditional>
-            </group>
-            <locator prefix=", "/>
-            <access prefix=", "/>
-          </type>
-          <type name="chapter">
-            <group delimiter=", ">
-              <author/>
-              <titles quotes="true"/>
-            </group>
-            <group class="container">
-              <text prefix=", " term-name="in" text-transform="lowercase"/>
-              <group delimiter=", ">
-                <titles relation="container" prefix=" " font-style="italic"/>
-                <editor/>
-                <translator/>
-              </group>
-              <group prefix=" (" suffix=")" delimiter=", ">
-                <group delimiter=": ">
-            	  <publisher><place/></publisher>
-            	  <publisher><name/></publisher>
-                </group>
-				<conditional>
-					<if field="date">
-						<date><year/></date>
-					</if><else>
-						<text term-name="no date"/>
-					</else>
-			    </conditional>
-              </group>
-              <conditional>
-                <if field="locator">
-                  <locator prefix=", "/>
-                </if><else>
-                  <pages prefix=", "/>
-                </else>
-              </conditional>
-              <access prefix=", "/>
-            </group>
-          </type>
-          <type name="article">
-            <group delimiter=", ">
-              <author/>
-              <titles quotes="true"/>
-              <titles relation="container" font-style="italic"/>
-              <date/>
-              <locator/>
-              <access/>
-            </group>
-          </type>
-          <type name="article-journal">
-            <group delimiter=", ">
-              <author/>
-              <titles quotes="true"/>
-              <titles relation="container" font-style="italic"/>
-            </group>
-            <volume prefix=" "/>
-            <issue prefix=", ">
-              <label form="short" text-transform="lowercase" suffix=". "/>
-              <number/>
-            </issue>
-            <date prefix=" (" suffix=")"/>
-            <locator prefix=": "/>
-            <access prefix=", "/>
-          </type>
-        </choose>
-      </item>
-      <item position="subsequent" ibid="true">
-        <author form="short"/>
-        <conditional>
-          <if type="book">
-            <titles prefix=", " font-style="italic" form="short"/>
-          </if><else>
-            <titles prefix=", " quotes="true" form="short"/>
-          </else>
-        </conditional>
-        <pages prefix=", "/>
-      </item>
+    </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="."/>
+      <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" quotes="true"/>
+	  </else>
+	</choose>
+      </substitute>
+    </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="short" quotes="true"/>
+      </if>
+      <else-if type="book">
+	<text variable="title" form="short" font-style="italic"/>
+      </else-if>
+      <else>
+	<text variable="title" form="short" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </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="4"/>
+    <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 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 book" match="any">
+	    <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=","/>
+	    </group>
+	    <text macro="editor-translator-short"/>
+	    <group prefix=" (" suffix=")" delimiter=", ">
+	      <text macro="publisher"/>
+	      <date variable="issued">
+		<date-part name="year"/>
+	      </date>
+	    </group>
+	  </else-if>
+	  <else-if type="article-journal">
+	    <group class="container" prefix=" ">
+	      <text variable="container-title" font-style="italic" prefix=" "/>
+	      <text macro="publisher"/>
+	      <text variable="volume"  prefix=" "/>
+	      <text variable="issue" prefix=", no. "/>
+	      <date variable="issued" prefix=" (" suffix=")">
+		<date-part name="year"/>
+	      </date>
+	      <text variable="page" prefix=": "/>
+	    </group>
+	  </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>
+	<text variable="locator" prefix=", "/>
+      </group> 
     </layout>
-  </citation>
+  </citation> 
 </style>