diff --git a/natura-croatica.csl b/natura-croatica.csl
index d414838644b..fc655f1585c 100644
--- a/natura-croatica.csl
+++ b/natura-croatica.csl
@@ -14,11 +14,11 @@
     <category field="biology"/>
     <issn>1330-0520</issn>
     <eissn>1848-7386</eissn>
-    <updated>2021-03-17T12:29:20+00:00</updated>
+    <updated>2021-10-27T08:21:10+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="author">
-    <names variable="author" suffix=".">
+    <names variable="author">
       <name and="symbol" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
         <name-part name="family" font-variant="small-caps"/>
       </name>
@@ -34,7 +34,9 @@
   </macro>
   <macro name="author-short">
     <names variable="author">
-      <name form="short" font-variant="small-caps" and="symbol" delimiter-precedes-last="never" initialize-with=". "/>
+      <name form="short" and="symbol" delimiter-precedes-last="never" initialize-with=". ">
+        <name-part name="family" font-variant="small-caps"/>
+      </name>
       <et-al font-style="italic"/>
       <substitute>
         <names variable="editor"/>
@@ -75,36 +77,31 @@
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
-        <group delimiter=" ">
-          <text macro="author-short"/>
-          <text macro="year-date"/>
-        </group>
+        <text macro="author-short"/>
         <group>
-          <text variable="locator"/>
+          <text macro="year-date"/>
           <text variable="year-suffix" font-style="italic"/>
         </group>
+        <text variable="locator"/>
       </group>
     </layout>
   </citation>
-  <bibliography entry-spacing="0" hanging-indent="true" subsequent-author-substitute-rule="partial-each" subsequent-author-substitute="&#8212;&#8212;&#8212;">
+  <bibliography subsequent-author-substitute-rule="partial-each" entry-spacing="0" hanging-indent="true">
     <sort>
       <key macro="author" names-min="1" names-use-first="1"/>
       <key macro="author-count"/>
       <key macro="year-date"/>
     </sort>
     <layout suffix=".">
-      <group>
-        <group delimiter=": ">
-          <group delimiter=", ">
-            <text macro="author"/>
-            <group>
-              <date variable="issued">
-                <date-part name="year"/>
-              </date>
-              <text variable="year-suffix" font-style="italic"/>
-            </group>
+      <group delimiter=": ">
+        <group delimiter=", ">
+          <text macro="author"/>
+          <group>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="year-suffix" font-style="italic"/>
           </group>
-          <text variable="title" suffix=". "/>
         </group>
         <choose>
           <if type="bill book graphic legal_case motion_picture report song" match="any">
@@ -147,9 +144,10 @@
           </else-if>
           <else-if type="chapter" match="any">
             <group delimiter=". ">
+              <text variable="title"/>
               <group prefix=" " delimiter=", ">
                 <group delimiter=": ">
-                  <text term="in" text-case="capitalize-first" font-style="italic"/>
+                  <text term="in" text-case="capitalize-first"/>
                   <text macro="editor"/>
                 </group>
                 <group>
@@ -191,7 +189,7 @@
             <group delimiter=" ">
               <group delimiter=". ">
                 <text variable="title"/>
-                <text variable="container-title" text-case="capitalize-first" font-style="normal"/>
+                <text variable="container-title" text-case="capitalize-first"/>
               </group>
               <group delimiter=", ">
                 <group>