diff --git a/csl/tgs-weimar-seminarfach.csl b/csl/tgs-weimar-seminarfach.csl
index 38dc51f..df91589 100644
--- a/csl/tgs-weimar-seminarfach.csl
+++ b/csl/tgs-weimar-seminarfach.csl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style class="note" version="1.0" name-form="short" et-al-min="2" et-al-use-first="1" demote-non-dropping-particle="never" default-locale="de-DE" xmlns="http://purl.org/net/xbiblio/csl">
+<style class="note" version="1.0" name-form="short" et-al-min="1" et-al-use-first="1" demote-non-dropping-particle="never" default-locale="de-DE" xmlns="http://purl.org/net/xbiblio/csl">
   <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
   <info>
     <title>TGS-Weimar Seminarfach</title>
@@ -11,32 +11,39 @@
       <email>tgs.info.oskar@gmail.com</email>
     </author>
     <summary>Seminarfach</summary>
-    <updated>2022-07-03T14:27:08+00:00</updated>
+    <updated>2022-07-03T15:28:53+00:00</updated>
     <rights>This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="author">
-    <choose>
-      <if match="any" variable="editor">
-        <names variable="editor" font-style="normal" font-variant="normal" text-decoration="none" vertical-align="baseline" suffix=": "/>
-      </if>
-      <else-if match="any" variable="collection-editor">
-        <names variable="collection-editor" suffix=": "/>
-      </else-if>
-      <else-if match="any" variable="author">
-        <names variable="author" font-style="normal" suffix=":  "/>
-      </else-if>
-      <else>
-        <text value="o.A." suffix=": "/>
-      </else>
-    </choose>
-  </macro>
+    <!-- <choose> -->
+    <!--   <if match="any" variable="editor"> -->
+    <!--     <names variable="editor" font-style="normal" font-variant="normal" text-decoration="none" vertical-align="baseline" suffix=": "/> -->
+    <!--   </if> -->
+    <!--   <else-if match="any" variable="collection-editor"> -->
+    <!--     <names variable="collection-editor" suffix=": "/> -->
+    <!--   </else-if> -->
+    <!--   <else-if match="any" variable="author"> -->
+    <!--     <names variable="author" font-style="normal" suffix=":  "/> -->
+    <!--   </else-if> -->
+    <!--   <else> -->
+    <!--     <text value="o.A." suffix=": "/> -->
+    <!--   </else> -->
+    <!-- </choose> -->
+    <names variable="editor" suffix=": ">
+	    <name form="short"/>
+		    <substitute>
+			    <names variable="collection-editor"/>
+			    <names variable="author"/>
+		    </substitute>
+    </names>
+</macro>
   <macro name="title">
     <choose>
       <if match="any" variable="title-short">
-        <text variable="title-short" suffix=", "/>
+        <text variable="title-short"/>
       </if>
       <else>
-        <text variable="title" suffix=", "/>
+        <text variable="title"/>
       </else>
     </choose>
   </macro>
@@ -48,12 +55,20 @@
         </if>
         <else-if match="any" position="ibid">
           <text term="ibid"/>
-          <text variable="page"/>
+          <choose>
+            <if match="any" variable="page">
+              <text variable="page"/>
+            </if>
+          </choose>
         </else-if>
         <else>
           <text macro="author"/>
           <text macro="title"/>
-          <text variable="page" suffix="."/>
+          <choose>
+            <if match="any" variable="page">
+              <text variable="page" suffix="."/>
+            </if>
+          </choose>
         </else>
       </choose>
     </layout>