diff --git a/sodertorns-hogskola-oxford.csl b/sodertorns-hogskola-oxford.csl
index a33b3912b86..2937f83bc43 100644
--- a/sodertorns-hogskola-oxford.csl
+++ b/sodertorns-hogskola-oxford.csl
@@ -15,7 +15,7 @@
     <category field="humanities"/>
     <category field="social_science"/>
     <summary>Södertörn University Oxford style without ibid</summary>
-    <updated>2021-01-29T16:30:01</updated>
+    <updated>2021-02-18T14:14:20+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="sv">
@@ -42,14 +42,14 @@
       <if variable="author">
         <names variable="author">
           <name name-as-sort-order="all" sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
           <name name-as-sort-order="all" sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
           <label prefix=" (" form="short" plural="contextual" suffix=")."/>
         </names>
@@ -57,7 +57,7 @@
       <else-if variable="composer">
         <names variable="composer">
           <name name-as-sort-order="all" sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
         </names>
       </else-if>
@@ -68,14 +68,14 @@
       <if variable="author">
         <names variable="author">
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
           <label prefix=" (" form="short" plural="contextual" suffix=")."/>
         </names>
@@ -83,7 +83,7 @@
       <else-if variable="composer">
         <names variable="composer">
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
         </names>
       </else-if>
@@ -94,14 +94,14 @@
       <if variable="author">
         <names variable="author">
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never" form="short">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
         </names>
       </if>
       <else-if variable="editor">
         <names variable="editor">
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
           <label prefix=" (" form="short" plural="contextual" suffix=")."/>
         </names>
@@ -109,7 +109,7 @@
       <else-if variable="composer">
         <names variable="composer">
           <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never" form="short">
-            <name-part name="family" text-case="capitalize-first"/>
+            <name-part name="family"/>
           </name>
         </names>
       </else-if>
@@ -119,8 +119,8 @@
     <choose>
       <if variable="container-author">
         <names variable="container-author">
-          <name name-as-sort-order="all" sort-separator=",&#160;" and="symbol" delimiter=", ">
-            <name-part name="family" text-case="capitalize-first"/>
+          <name name-as-sort-order="all" sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
+            <name-part name="family"/>
           </name>
         </names>
       </if>
@@ -129,8 +129,8 @@
           <if type="chapter paper-conference" match="any">
             <names variable="editor">
               <label prefix=" " form="short" plural="contextual" suffix=". "/>
-              <name sort-separator=",&#160;" and="symbol" delimiter=", ">
-                <name-part name="family" text-case="capitalize-first"/>
+              <name sort-separator=",&#160;" and="symbol" delimiter=", " delimiter-precedes-last="never">
+                <name-part name="family"/>
               </name>
             </names>
           </if>
@@ -140,7 +140,7 @@
   </macro>
   <macro name="sort-bibliography">
     <choose>
-      <if variable="author editor" match="any">
+      <if variable="author editor composer" match="any">
         <text macro="contributors-full"/>
       </if>
       <else>
@@ -253,9 +253,16 @@
     </group>
   </macro>
   <macro name="publisher">
-    <text prefix="(" macro="publisher-place" suffix=": "/>
-    <text macro="printers" suffix=", "/>
-    <text macro="issued-year" suffix=")"/>
+    <choose>
+      <if type="book report chapter entry entry-dictionary entry-encyclopedia paper-conference thesis map figure graphic" match="any">
+        <text prefix="(" macro="publisher-place" suffix=": "/>
+        <text macro="printers" suffix=", "/>
+        <text macro="issued-year" suffix=")"/>
+      </if>
+      <else>
+        <text macro="printers"/>
+      </else>
+    </choose>
   </macro>
   <macro name="issued-year">
     <choose>
@@ -362,14 +369,24 @@
   </macro>
   <macro name="medium">
     <choose>
-      <if type="map post post-weblog song motion_picture musical_score" match="any">
-        <text variable="genre" prefix="[" suffix="]"/>
+      <if type="motion_picture musical_score song broadcast" match="any">
+        <text prefix="[" variable="medium" suffix="]"/>
       </if>
       <else>
         <text variable="medium"/>
       </else>
     </choose>
   </macro>
+  <macro name="genre">
+    <choose>
+      <if type="thesis manuscript speech" match="none">
+        <text prefix="[" variable="genre" suffix="]"/>
+      </if>
+      <else>
+        <text variable="genre"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="archive">
     <choose>
       <if variable="archive" match="any">
@@ -398,7 +415,7 @@
           <choose>
             <if variable="author editor composer" match="none">
               <choose>
-                <if type="entry entry-dictionary entry-encyclopedia" match="any">
+                <if type="entry entry-dictionary entry-encyclopedia article-magazine article-journal" match="any">
                   <text prefix="&quot;" macro="title-short" suffix="&quot;, "/>
                   <text variable="container-title" font-style="italic"/>
                 </if>
@@ -452,8 +469,8 @@
                 </else>
               </choose>
               <text macro="title-long" font-style="italic" suffix=", "/>
-              <text macro="medium" suffix=", "/>
-              <text prefix=" " macro="issued"/>
+              <text macro="genre" suffix=", "/>
+              <text macro="issued"/>
               <choose>
                 <if variable="URL" match="any">
                   <text prefix=", " macro="page-range"/>
@@ -492,6 +509,7 @@
             <else-if type="paper-conference speech" match="any">
               <text macro="contributors-long" suffix=", "/>
               <text prefix="&quot;" macro="title-long" suffix="&quot;, "/>
+              <text prefix=" " macro="genre" suffix=", "/>
               <text variable="event"/>
               <text prefix=", " macro="container"/>
               <text prefix=" " macro="publisher"/>
@@ -505,8 +523,7 @@
             <else-if type="thesis" match="any">
               <text macro="contributors-long" suffix=", "/>
               <text macro="title-long" font-style="italic"/>
-              <text prefix=" " macro="medium"/>
-              <text prefix=", " variable="genre"/>
+              <text prefix=", " macro="genre"/>
               <text prefix=" " macro="publisher"/>
               <text macro="locator-or-period"/>
             </else-if>
@@ -532,6 +549,7 @@
               <text macro="contributors-full" suffix=", "/>
               <text macro="title-long" font-style="italic"/>
               <text prefix=", " macro="medium"/>
+              <text prefix=", " macro="genre"/>
               <text prefix=", " variable="scale"/>
               <choose>
                 <if variable="publisher publisher-place" match="any">
@@ -545,7 +563,7 @@
               <text prefix=", " variable="source"/>
               <choose>
                 <if variable="URL" match="any">
-                  <text prefix=" " macro="identifier"/>
+                  <text prefix=", " macro="identifier"/>
                   <text prefix=" " macro="quoted" suffix="."/>
                 </if>
                 <else>
@@ -556,11 +574,12 @@
             <else>
               <text macro="contributors-long" suffix=", "/>
               <text macro="title-long" font-style="italic"/>
+              <text prefix=", " macro="genre"/>
               <text prefix=", " macro="medium"/>
               <choose>
                 <if variable="URL" match="any">
                   <text prefix=", " macro="issued"/>
-                  <text prefix=", " variable="publisher"/>
+                  <text prefix=", " macro="publisher"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=", " macro="identifier"/>
                   <text prefix=" " macro="quoted" suffix="."/>
@@ -568,7 +587,7 @@
                 <else-if variable="issued" match="none">
                   <choose>
                     <if variable="publisher publisher-place" match="any">
-                      <text prefix=", " macro="printers"/>
+                      <text prefix=", " macro="publisher"/>
                     </if>
                   </choose>
                   <choose>
@@ -581,7 +600,7 @@
                   </choose>
                 </else-if>
                 <else>
-                  <text prefix=", " variable="publisher"/>
+                  <text prefix=", " macro="publisher"/>
                   <text prefix=", " macro="issued"/>
                   <text prefix=", " macro="archive"/>
                   <choose>
@@ -638,8 +657,8 @@
             </else>
           </choose>
           <text macro="title-long" font-style="italic" suffix=", "/>
-          <text macro="medium" suffix=", "/>
-          <text prefix=" " macro="issued"/>
+          <text macro="genre" suffix=", "/>
+          <text macro="issued"/>
           <choose>
             <if variable="URL" match="any">
               <text prefix=", " macro="page-range"/>
@@ -679,13 +698,14 @@
         <else-if type="paper-conference speech" match="any">
           <text macro="contributors-full" suffix=", "/>
           <text prefix="&quot;" macro="title-long" suffix="&quot;, "/>
+          <text prefix=" " macro="genre" suffix=", "/>
           <text variable="event"/>
           <text prefix=", " macro="container-full"/>
           <text prefix=" " macro="publisher"/>
           <choose>
             <if variable="DOI" match="any">
-              <text prefix=", " macro="page-range" suffix=", "/>
-              <text prefix="doi:" variable="DOI" suffix="."/>
+              <text prefix=", " macro="page-range"/>
+              <text prefix=", doi:" variable="DOI" suffix="."/>
             </if>
             <else>
               <text prefix=", " macro="page-range"/>
@@ -696,8 +716,7 @@
         <else-if type="thesis" match="any">
           <text macro="contributors-full" suffix=", "/>
           <text macro="title-long" font-style="italic"/>
-          <text prefix=" " macro="medium"/>
-          <text prefix=", " variable="genre"/>
+          <text prefix=", " macro="genre"/>
           <text prefix=" " macro="publisher" suffix="."/>
         </else-if>
         <else-if type="report" match="any">
@@ -722,6 +741,7 @@
           <text macro="contributors-full" suffix=", "/>
           <text macro="title-long" font-style="italic"/>
           <text prefix=", " macro="medium"/>
+          <text prefix=", " macro="genre"/>
           <text prefix=", " variable="scale"/>
           <choose>
             <if variable="publisher publisher-place" match="any">
@@ -735,7 +755,7 @@
           <text prefix=", " variable="source"/>
           <choose>
             <if variable="URL" match="any">
-              <text prefix=" " macro="identifier"/>
+              <text prefix=", " macro="identifier"/>
               <text prefix=" " macro="quoted" suffix="."/>
             </if>
             <else>
@@ -746,24 +766,26 @@
         <else-if type="bill legal_case legislation personal_communication" match="none">
           <text macro="contributors-full" suffix=", "/>
           <text macro="title-long" font-style="italic"/>
+          <text prefix=", " macro="genre"/>
           <text prefix=", " macro="medium"/>
           <choose>
             <if variable="URL" match="any">
               <text prefix=", " macro="issued"/>
-              <text prefix=", " variable="publisher"/>
+              <text prefix=", " macro="publisher"/>
               <text prefix=", " macro="identifier"/>
               <text prefix=" " macro="quoted" suffix="."/>
             </if>
             <else-if variable="issued" match="none">
               <choose>
                 <if variable="publisher publisher-place" match="any">
-                  <text prefix=", " macro="printers"/>
+                  <text prefix=", " macro="publisher"/>
                 </if>
               </choose>
-              <text prefix=", " macro="collection" suffix="."/>
+              <text prefix=", " macro="collection"/>
+              <text value="."/>
             </else-if>
             <else>
-              <text prefix=", " variable="publisher"/>
+              <text prefix=", " macro="publisher"/>
               <text prefix=", " macro="issued"/>
               <text prefix=", " macro="archive"/>
               <text value="."/>