diff --git a/csl/ro-humanities.csl b/csl/ro-humanities.csl
index 8291d3315..5bd05a708 100644
--- a/csl/ro-humanities.csl
+++ b/csl/ro-humanities.csl
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <?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>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
+   <info>
         <title>Romanian Humanities</title>
         <id>http://www.zotero.org/styles/ro-humanities</id>
         <link href="http://www.zotero.org/styles/ro-humanities"/>
@@ -11,369 +12,316 @@
         <category term="humanities"/>
         <category term="generic-base"/>
         <category term="author-date"/>
-        <updated>2007-11-28T10:10:10</updated>
+        <updated>2008-07-10T10: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>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="verb" text-case="lowercase"/>
+      <name delimiter=", " prefix=" " delimiter-precedes-last="always"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator" delimiter=", ">
+      <label form="verb" text-case="lowercase"/>
+      <name and="text" delimiter=", " prefix=" " delimiter-precedes-last="never"/>
+    </names>
+  </macro>
+  <macro name="editor-short">
+    <choose>
+      <if variable="author">
+	<names variable="editor" delimiter=", ">
+	  <name delimiter=", " delimiter-precedes-last="always"/>
+	  <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
+	</names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name delimiter=", " delimiter-precedes-last="always" sort-separator=", "/>
+      <label form="short" prefix=" (" suffix=".)"/>
+      <substitute>
+	<names variable="editor"/> 
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-bib">
+    <names variable="author">
+      <name name-as-sort-order="all" form="long" delimiter="; " delimiter-precedes-last="always" sort-separator=", " font-variant="small-caps"/>
+      <label form="short" prefix=" (" suffix=".)"/>
+      <substitute>
+	<names variable="editor" font-variant="small-caps"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="recipient">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="access">
+    <group>
+      <group>
+	<text term="accessed" text-case="lowercase" suffix=" "/>
+	<date variable="accessed" suffix=", ">
+	  <date-part name="day" suffix=" "/>
+	  <date-part name="month" suffix=" " text-case="lowercase"/>
+	  <date-part name="year"/>
+	</date>
+      </group>
+      <group>
+	<text term="at" suffix=" "/>
+	<text variable="URL"/>
+      </group>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic"/>
+      </if>
+      <else>
+	<text variable="title" prefix="&#8222;"
+	      suffix="&#8221;"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-short">
+    <choose>
+      <if type="book">
+	<text variable="title" font-style="italic" form="short"/>
+      </if>
+      <else>
+	<text variable="title" prefix="&#8222;"
+	      suffix="&#8221;" form="short"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="collection-title">
+    <text variable="collection-title" prefix="colecţia "/>
+    <text variable="collection-number" prefix=" "/>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="graphic report" match="any">
+	<date variable="issued">
+	  <date-part name="day" suffix=" "/>
+	  <date-part name="month" suffix=" " text-case="lowercase"/>
+	  <date-part name="year"/>
+	</date>
+      </if>
+      <else-if type="book chapter thesis" match="any">
+	<date variable="issued">
+	  <date-part name="year"/>
+	</date>
+      </else-if>
+      <else>
+	<date variable="issued">
+	  <date-part name="day" suffix=" "/>
+	  <date-part name="month" suffix=" " text-case="lowercase"/>
+	  <date-part name="year"/>
+	</date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <group>
+      <label variable="locator" suffix="." form="short"/>
+      <text variable="locator" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" include-period="true"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <group>
+      <label variable="page" suffix="." form="short"/>
+      <text variable="page" prefix=" "/>
+    </group>
+  </macro>
+  <macro name="sort-key">
+    <text macro="author-bib" suffix=" "/>
+    <text variable="issue" suffix=" "/>
+    <text variable="genre"/>
+  </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="false"/>
+    <option name="disambiguate-add-names" value="true"/>
+    <option name="disambiguate-add-givenname" value="true"/>
+    <layout prefix="" suffix="." delimiter="; ">
+      <choose>
+	<if position="ibid-with-locator">
+	  <group delimiter=", ">
+	    <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+	    <text macro="locators"/>
+	  </group>
+	</if>
+	<else-if position="ibid">
+	  <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+	</else-if>
+	<else-if position="subsequent">
+	  <group>
+	    <group delimiter=", " prefix=", ">
+	      <text macro="author"/>
+	      <text macro="recipient"/>
+	    </group>
+	    <group delimiter=", " prefix=", ">
+	      <text macro="title-short"/>
+	      <text macro="volume"/>
+	    </group>
+	    <choose>
+	      <if type="interview">
+		<text term="interview" text-case="lowercase" prefix=", "/>
+	      </if>
+	      <else-if  variable="recipient">
+		<text macro="issued" prefix=", "/>
+	      </else-if>
+	    </choose>
+	    <text macro="locators" prefix=", "/>
+	  </group>  
+	</else-if>
+	<else>
+	  <group suffix=", ">
+	    <text macro="author"/>
+	    <text macro="recipient"/>
+	  </group>
+	  <text macro="title"/>
+	  <choose>
+	    <if type="chapter">
+	      <group class="container">
+		<text term="in" text-case="lowercase" prefix=", "/>
+		<group delimiter=", " prefix=" ">
+		  <text macro="editor-short"/>
+		  <text variable="container-title" font-style="italic"/>
+		</group>
+		<text macro="volume" prefix=", "/>
+	      </group>		   
+	      <text variable="edition" prefix=", "/>
+	      <text macro="collection-title" prefix=", "/>
+	      <text macro="publisher" prefix=", "/>
+	      <text macro="issued" prefix=", "/>		   
+	    </if>
+	    <else-if type="article-journal article-newspaper article-magazine" match="any">
+	      <group>
+		<group class="container">
+		  <text variable="container-title" font-style="italic" prefix=", "/>
+		  <text macro="volume" prefix=", "/>
+		  <text variable="issue" prefix=", nr. "/>
+		</group>
+		<text macro="issued" prefix=", "/>
+		<text macro="editor" prefix=", "/>
+		<text macro="translator" prefix=", "/>
+		<text variable="edition" prefix=", "/>
+		<text macro="publisher" prefix=", "/>
+	      </group>
+	    </else-if>
+	    <else-if type="book">
+	      <text macro="volume" prefix=", "/>
+	      <text macro="translator" prefix=", "/>
+	      <text macro="editor" prefix=", "/>
+	      <text variable="edition" prefix=", "/>
+	      <text macro="collection-title" prefix=", "/>
+	      <text macro="publisher" prefix=", "/>
+	      <text macro="issued" prefix=", "/>
+	    </else-if>
+	    <else>
+	      <group class="container">
+		<text variable="container-title" font-style="italic" prefix=", "/>
+		<group prefix=", ">
+		  <text macro="volume"/>
+		  <text variable="issue" prefix=", nr. "/>
+		</group>
+	      </group>
+	    </else>
+	  </choose>
+	  <text macro="locators" prefix=", "/>
+	  <text macro="access" prefix=", "/>
+	</else>
+      </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="sort-key"/>
+    </sort>
+    <layout suffix=".">
+      <text macro="author-bib" suffix=", "/>
+      <text macro="title"/>
+      <choose>
+	<if type="chapter">
+	  <group class="container" delimiter=", ">
+	    <text term="in" text-case="lowercase" prefix=", "/>
+	    <group delimiter=", " prefix=" ">
+	      <text macro="editor-short"/>
+	      <text variable="container-title" font-style="italic"/>
+	    </group>
+	    <text macro="volume" prefix=", "/>
+	  </group>
+	  <group delimiter=", " prefix=", ">
+	    <text variable="edition" prefix=", "/>
+	    <text macro="collection-title"/>
+	    <text macro="publisher"/>
+	    <text macro="issued"/>
+	    <text macro="pages"/>
+	  </group>
+	</if>
+	<else-if type="article-journal article-newspaper article-magazine" match="any">
+	  <group class="container" delimiter=", " prefix=", ">
+	    <text variable="container-title" font-style="italic"/>
+	    <text macro="volume"/>
+	    <text variable="issue" prefix="nr. "/>
+	    <text macro="issued"/>
+	    <text macro="editor"/>
+	    <text macro="translator"/>
+	    <text variable="edition"/>
+	    <text macro="publisher"/>
+	    <text macro="pages"/>
+	  </group>
+	</else-if>
+	<else-if type="book">
+	  <group delimiter=", " prefix=", ">
+	    <text macro="volume"/>
+	    <text macro="translator"/>
+	    <text macro="editor"/>
+	    <text variable="edition"/>
+	    <text macro="collection-title"/>
+	    <text macro="publisher"/>
+	    <text macro="issued"/>
+	  </group>
+	</else-if>
+	<else>
+	  <group class="container" delimiter=", " prefix=", ">
+	    <text variable="container-title" font-style="italic"/>
+	    <text macro="volume"/>
+	    <text variable="issue" prefix="nr. "/>
+	  </group>
+	</else>
+      </choose> 
+      <text macro="locators" prefix=", "/>
+      <text macro="access" prefix=", "/>
+    </layout>
+  </bibliography>
 </style>