diff --git a/eoa.csl b/eoa.csl
index ca4ea56..7b6bb34 100644
--- a/eoa.csl
+++ b/eoa.csl
@@ -34,11 +34,26 @@
       <term name="no date">ohne Datum</term>
     </terms>
   </locale>
+
+
+  <!-- The optional cs:macro elements can be used to store CSL code
+       for use by cs:citation, cs:bibliography, or other cs:macro
+       elements. -->
   <macro name="author">
     <names variable="author">
-      <name and="text" initialize="false" name-as-sort-order="all"/>
+      <name and="text" initialize="false" name-as-sort-order="first"/>
     </names>
   </macro>
+  <macro name="editor">
+    <choose>
+    <if variable="editor">
+      <text form="verb" term="editor" text-case="capitalize-first" suffix=" "/>
+      <names variable="editor">
+      <name and="text" initialize="false" form="long" />
+    </names>
+    </if>
+    </choose>
+</macro>
   <macro name="issued-year">
     <choose>
       <if variable="issued">
@@ -51,11 +66,22 @@
       </else>
     </choose>
   </macro>
-  
-  <!-- The optional cs:macro elements can be used to store CSL code
-       for use by cs:citation, cs:bibliography, or other cs:macro
-       elements. -->
+  <macro name="title">
+    <choose>
+      <if type="article-newspaper book report thesis pamphlet" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <text variable="container-title" font-style="italic" prefix="In: "/>
+  </macro>
 
+  <!-- The required cs:citation element defines the format of
+       citations. -->
   <citation et-al-min="3" et-al-use-first="1">
     <sort>
       <key macro="author"/>
@@ -67,9 +93,8 @@
       </group>
     </layout>
   </citation>
-  <!-- The required cs:citation element defines the format of
-       citations. -->
   <bibliography>
+
     <!-- The optional cs:bibliography element defines the format of the
          bibliography. -->
     <sort>
@@ -78,16 +103,23 @@
       <key variable="title"/>
     </sort>
     <layout suffix=".">
-      <group delimiter=". ">
+      <group delimiter=" " suffix=". ">
         <text macro="author"/>
-        <text macro="issued-year"/>
-        <text variable="title"/>
-        <text variable="container-title"/>
+        <text macro="issued-year" prefix="(" suffix=")"/>
+      </group>
+      <group delimiter=". " suffix=". ">
+        <text macro="title" />
+        <text macro="container-title"/>
+        <text macro="editor"/>
       </group>
       <group>
         <text variable="volume"/>
         <text variable="issue" prefix="(" suffix=")"/>
       </group>
+      <group delimiter=": " suffix=", ">
+        <text variable="publisher-place"/>
+        <text variable="publisher"/>
+      </group>
       <text variable="page"/>
     </layout>
   </bibliography>