diff --git a/oil-shale.csl b/oil-shale.csl
index 4d0d9c08619..6b7da61f500 100644
--- a/oil-shale.csl
+++ b/oil-shale.csl
@@ -1,338 +1,286 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
   <info>
     <title>Oil Shale</title>
     <id>http://www.zotero.org/styles/oil-shale</id>
     <link href="http://www.zotero.org/styles/oil-shale" rel="self"/>
-    <link href="http://www.zotero.org/styles/ieee" rel="template"/>
-    <link href="https://kirj.ee/oil-shale-instructions-to-authors/" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/proceedings-of-the-estonian-academy-of-sciences-numeric" rel="template"/>
+    <link href="https://kirj.ee/oil-shale-guidelines-for-authors/?v=04c19fa1e772" rel="documentation"/>
     <author>
-      <name>Zach Baird</name>
+      <name>Patrick O'Brien</name>
+      <email>citationstyler@gmail.com</email>
     </author>
     <category citation-format="numeric"/>
-    <category field="engineering"/>
-    <category field="geology"/>
+    <category field="generic-base"/>
     <issn>0208-189X</issn>
     <eissn>1736-7492</eissn>
-    <summary>Style for the journal Oil Shale</summary>
-    <updated>2021-04-15T00:00:00+00:00</updated>
+    <updated>2022-09-14T15:15:16+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="en">
     <terms>
-      <term name="chapter" form="short">ch.</term>
-      <term name="presented at">presented at the</term>
-      <term name="available at">available</term>
+      <term name="editortranslator" form="short">
+        <single>ed. and translator</single>
+        <multiple>eds. and translators</multiple>
+      </term>
+      <term name="translator" form="short">
+        <single>translator</single>
+        <multiple>translators</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>series ed.</single>
+        <multiple>series eds.</multiple>
+      </term>
+      <term name="editor" form="short">
+        <single>ed.</single>
+        <multiple>eds</multiple>
+      </term>
     </terms>
   </locale>
-  <!-- Macros -->
-  <macro name="status">
-    <choose>
-      <if variable="page issue volume" match="none">
-        <text variable="status" text-case="capitalize-first" suffix="" font-weight="bold"/>
-      </if>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
-        <choose>
-          <if is-numeric="edition">
-            <group delimiter=" ">
-              <number variable="edition" form="ordinal"/>
-              <text term="edition" form="short"/>
-            </group>
-          </if>
-          <else>
-            <text variable="edition" text-case="capitalize-first" suffix="."/>
-          </else>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="article-journal report" match="any">
-        <date variable="issued">
-          <date-part name="year" form="long"/>
-        </date>
-      </if>
-      <else-if type="bill book chapter graphic legal_case legislation motion_picture song thesis" match="any">
-        <date variable="issued">
-          <date-part name="year" form="long"/>
-        </date>
-      </else-if>
-      <else-if type="paper-conference" match="any">
-        <date variable="issued">
-          <date-part name="year" prefix=" "/>
-        </date>
-      </else-if>
-      <else>
-        <date variable="issued">
-          <date-part name="month" form="short" suffix=" "/>
-          <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
+  <macro name="editor">
+    <names variable="editor translator" delimiter="; ">
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" strip-periods="false" prefix=", "/>
+    </names>
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" et-al-min="7" et-al-use-first="1" initialize-with=". " delimiter=", " sort-separator=", "/>
-      <label form="short" prefix=", " text-case="capitalize-first"/>
-      <et-al font-style="italic"/>
+      <name delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=", "/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <names variable="editor translator"/>
       </substitute>
     </names>
   </macro>
-  <macro name="editor">
-    <names variable="editor" prefix="(" suffix=")">
-      <name name-as-sort-order="all" initialize-with=". " delimiter=", " sort-separator=", "/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <macro name="locators">
-    <group>
-      <text macro="edition"/>
-      <number variable="volume" form="numeric" font-weight="bold"/>
-      <group delimiter=" ">
-        <number variable="number-of-volumes" form="numeric"/>
-        <text term="volume" form="short" plural="true"/>
-      </group>
-      <number variable="issue" form="numeric" prefix="(" suffix=")"/>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
     </group>
   </macro>
   <macro name="title">
     <choose>
-      <if type="bill book graphic legal_case legislation motion_picture song" match="any">
-        <text variable="title" font-style="italic"/>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
       </if>
       <else>
         <text variable="title"/>
       </else>
     </choose>
   </macro>
-  <macro name="publisher">
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" text-case="capitalize-first"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="series">
+    <text variable="collection-title"/>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="full-issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="month" form="long" suffix=" "/>
+      <date-part name="day" suffix=", "/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
     <choose>
-      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference song" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
         </group>
       </if>
       <else>
-        <group delimiter=", ">
-          <text variable="publisher"/>
-          <text variable="publisher-place"/>
-        </group>
+        <text variable="edition" suffix="."/>
       </else>
     </choose>
   </macro>
-  <macro name="event">
-    <choose>
-      <if type="paper-conference speech" match="any">
-        <choose>
-          <!-- Published Conference Paper -->
-          <if variable="collection-editor editor editorial-director issue page volume" match="any">
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="in" text-case="capitalize-first" suffix=": "/>
-                <text variable="container-title" font-style="italic"/>
-              </group>
-              <text variable="event-place"/>
-            </group>
-          </if>
-          <!-- Unpublished Conference Paper -->
-          <else>
-            <group delimiter=", ">
-              <group delimiter=" ">
-                <text term="presented at"/>
-                <text variable="event"/>
-              </group>
-              <text variable="event-place"/>
-            </group>
-          </else>
-        </choose>
-      </if>
-    </choose>
-  </macro>
   <macro name="access">
     <choose>
-      <if type="webpage post post-weblog" match="any">
-        <choose>
-          <if variable="URL">
-            <group delimiter=" ">
-              <text variable="URL"/>
-              <group delimiter=" " prefix="(" suffix=")">
-                <text term="accessed"/>
-                <date variable="accessed">
-                  <date-part name="month" form="short" strip-periods="false"/>
-                  <date-part name="day" form="numeric-leading-zeros" prefix=" " suffix=", "/>
-                  <date-part name="year" form="long"/>
-                </date>
-              </group>
-            </group>
-          </if>
-        </choose>
+      <if type="report" match="any">
+        <text variable="URL"/>
       </if>
       <else-if match="any" variable="DOI">
-        <text variable="DOI" prefix="doi: "/>
+        <text variable="DOI" prefix="https://doi.org/"/>
       </else-if>
-      <else>
-        <group delimiter=". ">
-          <group delimiter=": ">
-            <text term="accessed" text-case="capitalize-first"/>
-            <date variable="accessed">
-              <date-part name="month" form="short" suffix=" "/>
-              <date-part name="day" form="numeric-leading-zeros" suffix=", "/>
-              <date-part name="year"/>
-            </date>
-          </group>
-          <text term="online" prefix="[" suffix="]" text-case="capitalize-first"/>
-          <group delimiter=": ">
-            <text term="available at" text-case="capitalize-first"/>
-            <text variable="URL"/>
-          </group>
-        </group>
-      </else>
     </choose>
   </macro>
-  <macro name="page">
-    <text variable="page"/>
-  </macro>
-  <macro name="citation-locator">
-    <group delimiter=" ">
-      <choose>
-        <if locator="page">
-          <label variable="locator" form="short"/>
-        </if>
-        <else>
-          <label variable="locator" form="short" text-case="capitalize-first"/>
-        </else>
-      </choose>
-      <text variable="locator"/>
-    </group>
-  </macro>
-  <!-- Citation -->
   <citation collapse="citation-number">
     <sort>
       <key variable="citation-number"/>
     </sort>
-    <layout delimiter=", ">
-      <group prefix="[" suffix="]" delimiter=", ">
-        <text variable="citation-number"/>
-        <text macro="citation-locator"/>
-      </group>
+    <layout vertical-align="baseline" delimiter=", " prefix="[" suffix="]">
+      <text variable="citation-number"/>
     </layout>
   </citation>
-  <!-- Bibliography -->
-  <bibliography entry-spacing="0" second-field-align="flush">
-    <layout suffix=".">
-      <!-- Citation Number -->
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush" entry-spacing="0">
+    <layout>
       <text variable="citation-number" suffix="."/>
-      <!-- Author(s) -->
-      <text macro="author" suffix=". "/>
-      <text macro="title" suffix=". "/>
-      <!-- Rest of Citation -->
-      <choose>
-        <!-- Specific Formats -->
-        <if type="article-journal">
-          <group delimiter=", ">
-            <text variable="container-title" font-style="italic" form="short"/>
-            <text macro="issued"/>
-            <text macro="locators"/>
-            <text macro="page"/>
-            <text macro="status"/>
-            <text macro="access"/>
-          </group>
-        </if>
-        <else-if type="paper-conference speech" match="any">
-          <group delimiter=", ">
-            <text macro="event"/>
-            <text macro="issued"/>
-            <text macro="locators"/>
-            <text macro="page"/>
-            <text macro="status"/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="report">
-          <group delimiter=". ">
-            <group delimiter=", ">
+      <group delimiter=". " suffix=".">
+        <text macro="author"/>
+        <choose>
+          <if type="article-journal review" match="any">
+            <group delimiter=" ">
+              <text macro="title" suffix="."/>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic" form="short"/>
+                <text macro="issued" font-weight="normal"/>
+                <choose>
+                  <if variable="volume">
+                    <group>
+                      <text variable="volume" font-weight="bold"/>
+                      <text variable="issue" prefix="(" suffix=")"/>
+                    </group>
+                  </if>
+                  <else>
+                    <group delimiter=" ">
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                      <text variable="issue"/>
+                    </group>
+                  </else>
+                </choose>
+                <text variable="page"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="article-magazine article-newspaper article" match="any">
+            <group delimiter=" ">
+              <text macro="title" suffix="."/>
+              <text variable="container-title" font-style="italic" suffix="."/>
+              <text macro="edition"/>
               <text macro="publisher"/>
+              <group delimiter=", ">
+                <text macro="full-issued"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text variable="genre"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="issued"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text term="patent" text-case="capitalize-first"/>
+                  <text variable="number"/>
+                </group>
+                <date variable="issued">
+                  <date-part name="year" suffix="-"/>
+                  <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+                  <date-part name="day" form="numeric-leading-zeros"/>
+                </date>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="editor" prefix=" "/>
+              <text macro="series"/>
+              <choose>
+                <if type="report">
+                  <group delimiter=" ">
+                    <text variable="genre"/>
+                    <text variable="number"/>
+                  </group>
+                </if>
+              </choose>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="issued"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="volume"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
               <group delimiter=" ">
+                <group delimiter=": ">
+                  <text term="in" text-case="capitalize-first"/>
+                  <text variable="container-title" text-case="title" font-style="italic"/>
+                </group>
+                <text macro="editor" prefix="(" suffix=")"/>
+              </group>
+              <choose>
+                <if type="entry-dictionary entry-encyclopedia" match="none"/>
+                <else>
+                  <text variable="container-title" font-style="italic"/>
+                </else>
+              </choose>
+              <text macro="series"/>
+              <text macro="volume"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="issued"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=" ">
+              <text variable="title"/>
+              <text variable="URL"/>
+              <date delimiter="" variable="accessed" prefix="(accessed " suffix=")">
+                <date-part name="year" suffix="-"/>
+                <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
+              </date>
+            </group>
+          </else-if>
+          <else-if type="report" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", ">
                 <text variable="genre"/>
-                <text variable="number"/>
+                <text macro="publisher"/>
+                <text macro="issued"/>
+                <group delimiter=" ">
+                  <text variable="number-of-pages"/>
+                  <label plural="never" variable="number-of-pages" form="short"/>
+                </group>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=", ">
+              <group delimiter=". ">
+                <text macro="title"/>
+                <text variable="container-title" font-style="italic"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="issued"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="page"/>
               </group>
-              <text macro="issued"/>
             </group>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="thesis">
-          <group delimiter=", ">
-            <text variable="genre"/>
-            <text macro="publisher"/>
-            <text macro="issued"/>
-          </group>
-        </else-if>
-        <else-if type="webpage post-weblog post" match="any">
-          <group delimiter=", " suffix=". ">
-            <text variable="container-title" font-style="italic"/>
-            <text macro="issued"/>
-          </group>
-          <text macro="access"/>
-        </else-if>
-        <else-if type="patent">
-          <group delimiter=", ">
-            <text variable="number"/>
-            <text macro="issued"/>
-          </group>
-        </else-if>
-        <!-- Generic/Fallback Formats -->
-        <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=", ">
-            <text macro="publisher"/>
-            <text macro="issued"/>
-            <text macro="locators"/>
-            <text macro="page"/>
-          </group>
-        </else-if>
-        <else-if type="article-magazine article-newspaper broadcast interview manuscript map patent personal_communication song speech thesis webpage" match="any">
-          <group delimiter=", ">
-            <text variable="container-title" font-style="italic"/>
-            <text macro="issued"/>
-            <text macro="locators"/>
-            <text macro="publisher"/>
-            <text macro="page"/>
-          </group>
-        </else-if>
-        <else-if type="chapter paper-conference" match="any">
-          <group delimiter=" " suffix=". ">
-            <text term="in" text-case="capitalize-first" suffix=": "/>
-            <text variable="container-title" font-style="italic"/>
-            <text macro="editor"/>
-          </group>
-          <group delimiter=", ">
-            <text macro="issued"/>
-            <text macro="locators"/>
-            <text macro="publisher"/>
-            <text macro="page"/>
-          </group>
-        </else-if>
-        <else>
-          <group delimiter=", ">
-            <text variable="container-title" font-style="italic"/>
-            <text macro="locators"/>
-            <text macro="publisher"/>
-            <text macro="page"/>
-            <text macro="issued"/>
-            <text macro="access"/>
-          </group>
-        </else>
-      </choose>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=". "/>
     </layout>
   </bibliography>
 </style>