diff --git a/csl/inter-ro.csl b/csl/inter-ro.csl
index c4c1ec5d0..40e330219 100644
--- a/csl/inter-ro.csl
+++ b/csl/inter-ro.csl
@@ -1,5 +1,6 @@
+<?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">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" xml:lang="en">
     <info>
         <title>INTER. Romanian Institute for Inter-Orthodox, Inter-Confessional and Inter-Religious Studies</title>
         <id>http://www.zotero.org/styles/inter-ro</id>
@@ -9,46 +10,71 @@
             <email>nicturcan@gmail.com</email>
         </author>
         <category term="theology"/>
-        <category term="generic-base"/>
         <category term="numeric"/>
         <updated>2008-01-11T01:13:54+00:00</updated>
     </info>
-    <macro name="editor-translator">
-        <names variable="editor translator" delimiter=", ">
-            <label form="verb"/>
+    <macro name="editor">
+        <names variable="editor" delimiter=", ">
+            <label form="verb" text-case="lowercase"/>
             <name and="text" delimiter=", " prefix=" " delimiter-precedes-last="never"/>
         </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 and="text" delimiter=", " delimiter-precedes-last="never"/>
+	    <label form="short" text-case="lowercase" prefix="(" suffix=".)" />
+	  </names>
+	</if>
+      </choose>
+    </macro>
     <macro name="author">
         <names variable="author">
-            <name form="long" delimiter="; " delimiter-precedes-last="always" font-variant="small-caps" sort-separator=", "/>
+            <name 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"/>
+                <names variable="editor" font-variant="small-caps"/> 
             </substitute>
         </names>
     </macro>
-    <macro name="author-bibliography">
+    <macro name="author-bib">
         <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="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>
-            <text term="accessed" suffix=" "/>
+	  <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"/>
@@ -83,153 +109,151 @@
             <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=" "/>
+	  <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=" "/>
+	  <date-part name="year"/>
+	</date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="sort-key">
+      <text macro="author-bib" suffix=" "/>
+      <text variable="title" suffix=" "/>
+      <text variable="genre"/>
+  </macro>
     <citation>
-        <option name="et-al-min" value="6"/>
+        <option name="et-al-min" value="4"/>
         <option name="et-al-use-first" value="1"/>
-        <option name="et-al-subsequent-min" value="3"/>
+        <option name="et-al-subsequent-min" value="4"/>
         <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" include-period="true"/>
-                        <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" include-period="true" 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 prefix="" suffix=".">
+	  <choose>
+	    <if position="ibid-with-locator">
+	      <group delimiter=", ">
+		<text term="ibid" form="long" font-style="italic" text-case="capitalize-first" suffix="."/>
+		<group>
+		  <label variable="locator" suffix="." form="short"/>
+		  <text variable="locator" prefix=" "/>
+		</group>
+	      </group>
+	    </if>
+	    <else-if position="ibid">
+	      <text term="ibid" form="long" font-style="italic" text-case="capitalize-first" suffix="."/>
+            </else-if>
+	    <else-if position="subsequent">
+              <group delimiter=", ">
+		<group>
+		  <text macro="author"/>
+		  <text macro="recipient"/>
+		</group>
+		<text macro="title-short"/>
+		<choose>
+		  <if type="interview">
+		    <text term="interview" text-case="lowercase"/>
+		  </if>
+		  <else-if  variable="recipient">
+		    <text macro="issued"/>
+		  </else-if>
+		</choose>
+		<group>
+		  <label variable="locator" suffix="." form="short"/>
+		  <text variable="locator" prefix=" "/>
+		</group>
+	      </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" suffix=","/>
+		      <text variable="container-title" font-style="italic"/>
+		    </group>
+		    <text variable="volume" prefix=" "/>
+		    <text variable="collection-title" prefix=" (= " suffix=")"/>
+		  </group>		   
+		  <text variable="edition" prefix=", "/>
+		  <text macro="publisher" prefix=", "/>
+		  <text macro="issued" prefix=", "/>		   
+		  <group prefix=", ">
+		    <label variable="locator" suffix="." form="short"/>
+		    <text variable="locator" prefix=" "/>
+		  </group>
+		  <text macro="access" prefix=", "/>
+		</if>
+		<else-if type="article-journal article-newspaper article-magazine" match="any">
+		  <group>
+		    <group class="container" delimiter=" ">
+		      <text variable="container-title" font-style="italic" prefix=", "/>
+		      <group delimiter=", " prefix=" ">
+			<text variable="volume"/>
+			<text variable="issue"/>
+		      </group>
+		      <text macro="issued" prefix=" (" suffix=")"/>
+		    </group>
+		    <text macro="editor" prefix=", "/>
+		    <text macro="translator" prefix=", "/>
+		    <text variable="edition" prefix=", "/>
+		    <text macro="publisher" prefix=", "/>
+		    <group>
+		      <label variable="locator" suffix="." form="short" prefix=", "/>
+		      <text variable="locator" prefix=" "/>
+		    </group>
+		    <text macro="access" prefix=", "/>
+		  </group>
+		</else-if>
+		<else-if type="book">
+		  <group>
+		    <text variable="volume" prefix=" "/>
+		    <text variable="collection-title" prefix=" (= " suffix=")"/>
+		  </group>
+		  <text macro="translator" prefix=", "/>
+		  <text macro="editor" prefix=", "/>
+		  <text variable="edition" prefix=", "/>
+		  <text macro="publisher" prefix=", "/>
+		  <text macro="issued" prefix=", "/>
+		  <group>
+		    <label variable="locator" prefix=", " suffix="." form="short"/>
+		    <text variable="locator" prefix=" "/>
+		  </group>
+		  <text macro="access" prefix=", "/>
+		</else-if>
+		<else>
+		  <group class="container">
+		    <text variable="container-title" font-style="italic" prefix=", "/>
+		    <text variable="volume" prefix=" "/>
+		    <text variable="issue" prefix=", "/>
+		    <group>
+		      <label variable="locator" include-period="true" form="short" prefix=", "/>
+		      <text variable="locator" prefix=" "/>
+		    </group>
+		  </group>
+		</else>
+	      </choose>
+	    </else>
+	  </choose>
         </layout>
     </citation>
     <bibliography>
@@ -237,97 +261,83 @@
         <option name="et-al-min" value="6"/>
         <option name="et-al-use-first" value="6"/>
         <sort>
-            <key macro="author-bibliography"/>
-            <key variable="title"/>
+            <key macro="sort-key"/>
         </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>
+	<layout suffix=".">
+	  <text macro="author-bib" suffix=", "/>
+	  <text macro="title"/>
+	  <choose>
+	    <if type="chapter">
+	      <group class="container">
+		<text term="in" text-case="lowercase" prefix=", "/>
+		<group delimiter=", " prefix=" ">
+		  <text macro="editor-short" suffix=","/>
+		  <text variable="container-title" font-style="italic"/>
+		</group>
+		<text variable="volume" prefix=" "/>
+		<text variable="collection-title" prefix=" (= " suffix=")"/>
+	      </group>		   
+	      <text variable="edition" prefix=", "/>
+	      <text macro="publisher" prefix=", "/>
+	      <text macro="issued" prefix=", "/>
+	      <group>
+		<label variable="page" include-period="true" form="short" prefix=", "/>
+		<text variable="page" prefix=" "/>
+	      </group>
+	      <group prefix=", ">
+		<label variable="locator" suffix="." form="short"/>
+		<text variable="locator" prefix=" "/>
+	      </group>
+	      <text macro="access" prefix=", "/>
+	    </if>
+	    <else-if type="article-journal article-newspaper article-magazine" match="any">
+	      <group class="container" delimiter=" ">
+		<text variable="container-title" font-style="italic" prefix=", "/>
+		<group delimiter=", " prefix=" ">
+		  <text variable="volume"/>
+		  <text variable="issue"/>
+		</group>
+		<text macro="issued" prefix=" (" suffix=")"/>
+	      </group>
+	      <text macro="editor" prefix=", "/>
+	      <text macro="translator" prefix=", "/>
+	      <text variable="edition" prefix=", "/>
+	      <text macro="publisher" prefix=", "/>
+	      <group>
+		<label variable="locator" suffix="." form="short" prefix=", "/>
+		<text variable="locator" prefix=" "/>
+	      </group>
+	      <text macro="access" prefix=", "/>
+	    </else-if>
+	    <else-if type="book">
+	     <group>
+	       <text variable="volume" prefix=" "/>
+	       <text variable="collection-title" prefix=" (= " suffix=")"/>
+	     </group>
+	     <text macro="translator" prefix=", "/>
+	     <text macro="editor" prefix=", "/>
+	     <text variable="edition" prefix=", "/>
+	     <text macro="publisher" prefix=", "/>
+	     <text macro="issued" prefix=", "/>
+	     <group>
+	       <label variable="locator" prefix=", " suffix="." form="short"/>
+	       <text variable="locator" prefix=" "/>
+	     </group>
+	     <text macro="access" prefix=", "/>
+	    </else-if>
+	    <else>
+	      <group class="container">
+		<text variable="container-title" font-style="italic" prefix=", "/>
+		<text variable="volume" prefix=" "/>
+		<text variable="issue" prefix=", "/>
+		<group>
+		  <label variable="locator" include-period="true" form="short" prefix=", "/>
+		  <text variable="locator" prefix=" "/>
+		</group>
+	      </group>
+	    </else>
+	  </choose>    
+	  <text macro="access" prefix=", "/>
+	</layout>
     </bibliography>
-</style>
+  </style>