diff --git a/environmental-values.csl b/environmental-values.csl
index a1d1b504d86..a449d1e475c 100644
--- a/environmental-values.csl
+++ b/environmental-values.csl
@@ -13,7 +13,7 @@
     <category citation-format="author-date"/>
     <category field="humanities"/>
     <issn>0963-2719</issn>
-    <updated>2017-07-24T09:28:04+00:00</updated>
+    <updated>2021-04-12T05:24:41+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>
   <macro name="title">
@@ -21,6 +21,9 @@
       <if type="bill book graphic legal_case motion_picture report song" match="any">
         <text variable="title" text-case="capitalize-first" font-style="italic"/>
       </if>
+      <else-if type="article-journal" match="any">
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
+      </else-if>
       <else>
         <text variable="title"/>
       </else>
@@ -28,8 +31,8 @@
   </macro>
   <macro name="editor">
     <names variable="editor">
-      <name sort-separator=", " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" strip-periods="false" prefix=" (" suffix=")"/>
+      <name delimiter-precedes-last="never" initialize-with="."/>
+      <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
   <macro name="collection-title">
@@ -127,9 +130,9 @@
   <macro name="author-short">
     <names variable="author">
       <name delimiter-precedes-last="always" initialize-with="." name-as-sort-order="all"/>
-      <label form="short" prefix=". "/>
+      <label form="short" prefix=" "/>
       <substitute>
-        <names variable="editor" suffix=" ed."/>
+        <names variable="editor"/>
         <text variable="title"/>
       </substitute>
     </names>
@@ -149,12 +152,18 @@
   <macro name="year-date">
     <choose>
       <if variable="issued">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+        <group delimiter=" ">
+          <date variable="original-date" form="text" date-parts="year" prefix="[" suffix="]"/>
+          <date variable="issued">
+            <date-part name="year"/>
+          </date>
+        </group>
       </if>
+      <else-if variable="status">
+        <text variable="status"/>
+      </else-if>
       <else>
-        <text value="n.d."/>
+        <text term="no date" form="short"/>
       </else>
     </choose>
   </macro>
@@ -166,6 +175,9 @@
   <macro name="volume">
     <text variable="volume" font-weight="bold"/>
   </macro>
+  <macro name="doi">
+    <text variable="DOI" prefix="https://doi.org/"/>
+  </macro>
   <citation et-al-min="3" et-al-use-first="1" collapse="year">
     <sort>
       <key variable="issued" sort="ascending"/>
@@ -193,7 +205,7 @@
       <key macro="year-date" sort="ascending"/>
       <key macro="title"/>
     </sort>
-    <layout suffix=".">
+    <layout>
       <choose>
         <if type="bill book" match="any">
           <group delimiter=". ">
@@ -209,7 +221,7 @@
           <group delimiter=" ">
             <text macro="author-short"/>
             <text macro="year-date"/>
-            <text macro="title"/>
+            <text macro="title" quotes="true" suffix="."/>
             <text term="in" text-case="capitalize-first"/>
             <text macro="container-author"/>
             <group delimiter=", " suffix=",">
@@ -218,6 +230,9 @@
             </group>
             <text macro="locators"/>
           </group>
+          <group display="block">
+            <text macro="doi"/>
+          </group>
         </else-if>
         <else-if type="thesis">
           <text macro="author-short" suffix=". "/>
@@ -262,18 +277,17 @@
               </group>
             </if>
             <else>
-              <text macro="title"/>
-              <group delimiter=", " prefix=" (" suffix="). ">
-                <text macro="volume"/>
-                <text macro="year-date"/>
-              </group>
+              <text macro="author-short" suffix=". "/>
               <text macro="year-date" suffix=". "/>
-              <text macro="author-short" prefix="Ed. " suffix=". "/>
+              <text macro="title" suffix=". "/>
               <text macro="publisher" suffix=". "/>
               <group delimiter=", " suffix=". ">
                 <text macro="volume" prefix="v."/>
                 <text variable="page" suffix=" p"/>
               </group>
+              <group display="block">
+                <text macro="doi"/>
+              </group>
             </else>
           </choose>
         </else-if>
@@ -290,6 +304,9 @@
             <text macro="locators" suffix=": "/>
             <text variable="page"/>
           </group>
+          <group display="block">
+            <text macro="doi"/>
+          </group>
         </else-if>
         <else-if type="map" match="any">
           <group delimiter=". ">