diff --git a/universitat-basel-iberoromanistik.csl b/universitat-basel-iberoromanistik.csl
index 0eaea643896..1f62279ec14 100644
--- a/universitat-basel-iberoromanistik.csl
+++ b/universitat-basel-iberoromanistik.csl
@@ -26,7 +26,7 @@
     <choose>
       <if type="book" match="any">
         <names variable="translator" delimiter="/" prefix="[" suffix="]">
-          <label form="short"/>
+          <label form="short" suffix=" "/>
           <name delimiter=" / " delimiter-precedes-last="always"/>
           <et-al font-style="italic"/>
         </names>
@@ -36,16 +36,16 @@
   <macro name="editor">
     <choose>
       <if type="chapter article-journal paper-conference" match="any">
-        <names variable="editor" delimiter=" / ">
+        <names variable="editor" delimiter=" / " suffix=":">
           <name delimiter=" / " delimiter-precedes-last="always" name-as-sort-order="all"/>
           <et-al font-style="italic"/>
-          <label form="short" prefix="(" suffix=")"/>
+          <label form="short" prefix=" (" suffix=")"/>
         </names>
       </if>
       <else>
         <names variable="editor" delimiter=" / ">
           <name name-as-sort-order="all" sort-separator=", " delimiter="/" delimiter-precedes-last="always" form="long"/>
-          <label form="short" prefix="(" suffix=")"/>
+          <label form="short" prefix=" (" suffix=")"/>
         </names>
       </else>
     </choose>
@@ -196,17 +196,14 @@
   <macro name="container-title">
     <choose>
       <if type="chapter paper-conference" match="any">
-        
+        <text macro="editor"/>
       </if>
     </choose>
     <choose>
       <if type="chapter paper-conference" match="any">
-        <group delimiter=": ">
-          <text macro="editor"/>
-          <group delimiter=". " suffix=".">
-            <text variable="container-title" text-case="title" font-style="italic"/>
-            <text macro="number-of-volumes"/>
-          </group>
+        <group delimiter=". " prefix=" " suffix=".">
+          <text variable="container-title" text-case="title" font-style="italic"/>
+          <text macro="number-of-volumes"/>
         </group>
       </if>
       <else-if type="webpage post-weblog" match="any">
@@ -255,19 +252,17 @@
     </sort>
     <layout suffix=".">
       <group delimiter=". ">
-        <group delimiter=" ">
+        <group delimiter=" " suffix=".">
           <text macro="author"/>
           <text macro="year-date" prefix="(" suffix="):"/>
           <text macro="title"/>
           <text macro="container-prefix"/>
-          <group delimiter=": ">
-            <choose>
-              <if type="article-journal" match="all" variable="editor">
-                <text macro="editor"/>
-              </if>
-            </choose>
-            <text macro="container-title"/>
-          </group>
+          <choose>
+            <if type="article-journal" match="all" variable="editor">
+              <text macro="editor"/>
+            </if>
+          </choose>
+          <text macro="container-title"/>
           <text macro="edition"/>
           <text macro="genre"/>
           <group delimiter=", " suffix=".">