diff --git a/dependent/the-lawyer-quarterly.csl b/dependent/the-lawyer-quarterly.csl
new file mode 100644
index 000000000000..2170c855c348
--- /dev/null
+++ b/dependent/the-lawyer-quarterly.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-GB">
+  <info>
+    <title>The Lawyer Quarterly</title>
+    <id>http://www.zotero.org/styles/the-lawyer-quarterly</id>
+    <link href="http://www.zotero.org/styles/the-lawyer-quarterly" rel="self"/>
+    <link href="http://www.zotero.org/styles/pravnik" rel="independent-parent"/>
+    <link href="https://tlq.ilaw.cas.cz/index.php/tlq/about/submissions#authorGuidelines" rel="documentation"/>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <issn>1805-8396</issn>
+    <eissn>1805-840X</eissn>
+    <summary>Suitable for The Lawyer Quarterly - a journal published by the Institute of State and Law of the Czech Academy of Sciences.</summary>
+    <updated>2020-05-25T10:00:00+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>
+</style>
diff --git a/iso690-full-note-cs.csl b/iso690-full-note-cs.csl
index 5a774d3c9670..6e449e31b5dd 100644
--- a/iso690-full-note-cs.csl
+++ b/iso690-full-note-cs.csl
@@ -14,20 +14,32 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Czech ISO-690, full note.</summary>
-    <updated>2020-04-13T10:00:00+00:00</updated>
+    <updated>2020-05-25T10:00:00+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="cs">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="accessed" form="short">cit.</term>
       <term name="editor" form="short">
         <single>ed</single>
         <multiple>eds</multiple>
       </term>
-      <term name="in">in:</term>
-      <term name="page-range-delimiter">-</term>
     </terms>
   </locale>
+  <macro name="page-range">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="locator-or-period">
+    <choose>
+      <if variable="locator" match="none">
+        <text value="."/>
+      </if>
+      <else>
+        <text prefix=", " macro="citation-locator" suffix="."/>
+      </else>
+    </choose>
+  </macro>
   <macro name="contributors-full">
     <choose>
       <if variable="author">
@@ -157,7 +169,7 @@
   <macro name="container">
     <choose>
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
-        <text term="in" text-case="capitalize-first" suffix=" "/>
+        <text term="in" text-case="capitalize-first" suffix=": "/>
         <text macro="container-contributors" suffix=" "/>
         <choose>
           <if variable="container-title">
@@ -179,7 +191,7 @@
   <macro name="container-full">
     <choose>
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
-        <text term="in" text-case="capitalize-first" suffix=" "/>
+        <text term="in" text-case="capitalize-first" suffix=": "/>
         <text macro="container-contributors-full" suffix=" "/>
         <choose>
           <if variable="container-title">
@@ -207,28 +219,10 @@
     </choose>
   </macro>
   <macro name="publisher-place">
-    <group delimiter="; ">
-      <choose>
-        <if variable="publisher-place accessed DOI URL" match="any">
-          <text variable="publisher-place"/>
-        </if>
-        <else>
-          <text value="[s.l.]"/>
-        </else>
-      </choose>
-    </group>
+    <text variable="publisher-place"/>
   </macro>
   <macro name="printers">
-    <group delimiter="; ">
-      <choose>
-        <if variable="publisher accessed DOI URL" match="any">
-          <text variable="publisher"/>
-        </if>
-        <else>
-          <text value="[s.n.]"/>
-        </else>
-      </choose>
-    </group>
+    <text variable="publisher"/>
   </macro>
   <macro name="publisher">
     <group delimiter=": ">
@@ -239,32 +233,46 @@
   <macro name="issued">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
-        </date>
-        <choose>
-          <if variable="volume">
-            <text prefix=", " term="volume" form="short" suffix=". "/>
-            <text variable="volume"/>
-          </if>
-        </choose>
+        <group delimiter=", ">
+          <date variable="issued">
+            <date-part name="year" range-delimiter="&#8211;"/>
+          </date>
+          <choose>
+            <if variable="volume">
+              <text term="volume" form="short" suffix="&#160;"/>
+              <text variable="volume"/>
+            </if>
+          </choose>
+        </group>
         <choose>
           <if variable="issue">
-            <text prefix=", " term="issue" form="short" suffix=". "/>
+            <text prefix=", " term="issue" form="short" suffix="&#160;"/>
             <text variable="issue"/>
           </if>
         </choose>
       </if>
+      <else-if type="webpage" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=".&#160;"/>
+          <date-part name="month" suffix=".&#160;" form="numeric"/>
+          <date-part name="year"/>
+        </date>
+      </else-if>
+      <else-if type="entry entry-dictionary entry-encyclopedia thesis" match="any">
+        <date variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </else-if>
       <else>
         <text prefix=" " macro="publisher" suffix=", "/>
         <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
+          <date-part name="year" range-delimiter="&#8211;"/>
         </date>
       </else>
     </choose>
   </macro>
   <macro name="citation-locator">
-    <label variable="locator" form="short" suffix=". "/>
+    <label variable="locator" form="short" suffix="&#160;"/>
     <text variable="locator"/>
   </macro>
   <macro name="collection">
@@ -279,33 +287,36 @@
   <macro name="ISBN">
     <choose>
       <if variable="ISBN">
-        <text variable="ISBN" prefix="ISBN "/>
+        <text variable="ISBN" prefix="ISBN&#160;"/>
       </if>
     </choose>
   </macro>
   <macro name="ISSN">
     <choose>
       <if variable="ISSN">
-        <text variable="ISSN" prefix="ISSN "/>
+        <text variable="ISSN" prefix="ISSN&#160;"/>
       </if>
     </choose>
   </macro>
   <macro name="identifier">
-    <group delimiter="; ">
-      <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="DOI: "/>
-        </if>
-        <else>
-          <text variable="URL" prefix="Dostupné z: "/>
-        </else>
-      </choose>
-    </group>
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI:&#160;"/>
+      </if>
+      <else>
+        <text term="available at" text-case="capitalize-first" suffix=":&#160;"/>
+        <text variable="URL"/>
+      </else>
+    </choose>
   </macro>
   <macro name="medium">
     <choose>
-      <if variable="accessed DOI URL" match="any">
-        <text term="online" prefix="[" suffix="]"/>
+      <if variable="URL" match="any">
+        <choose>
+          <if variable="DOI" match="none">
+            <text term="online" prefix="[" suffix="]"/>
+          </if>
+        </choose>
       </if>
       <else>
         <text variable="archive" prefix="[" suffix="]"/>
@@ -313,13 +324,22 @@
     </choose>
   </macro>
   <macro name="quoted">
-    <group prefix="[cit. " suffix="]">
-      <date variable="accessed">
-        <date-part name="day" suffix="." form="numeric-leading-zeros"/>
-        <date-part name="month" suffix="." form="numeric-leading-zeros"/>
-        <date-part name="year"/>
-      </date>
-    </group>
+    <choose>
+      <if variable="URL" match="any">
+        <choose>
+          <if variable="DOI" match="none">
+            <group prefix="[" suffix="]">
+              <text term="accessed" form="short" suffix="&#160;"/>
+              <date variable="accessed">
+                <date-part name="day" suffix="." form="numeric-leading-zeros"/>
+                <date-part name="month" suffix="." form="numeric-leading-zeros"/>
+                <date-part name="year"/>
+              </date>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
     <layout delimiter="; ">
@@ -336,16 +356,7 @@
         <else-if position="subsequent">
           <text macro="contributors-short" suffix=". "/>
           <text macro="title-short" font-style="italic"/>
-          <choose>
-            <if variable="locator">
-              <text prefix=", " macro="citation-locator" suffix="."/>
-            </if>
-            <else-if variable="accessed URL DOI" match="any">
-              <text term="online" prefix=" [" suffix="] "/>
-              <text macro="quoted"/>
-              <text prefix=". " macro="identifier"/>
-            </else-if>
-          </choose>
+          <text macro="locator-or-period"/>
         </else-if>
         <else>
           <choose>
@@ -353,10 +364,10 @@
               <text macro="contributors-long" suffix=". "/>
               <text macro="title-long" suffix=". "/>
               <text macro="container"/>
+              <text prefix=". " variable="volume" text-case="capitalize-first"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=". " macro="issued"/>
-                  <text prefix=", sv. " variable="volume"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
                   <text prefix=". " macro="identifier"/>
@@ -367,26 +378,11 @@
                       <text prefix=". " macro="publisher"/>
                     </if>
                   </choose>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else-if>
                 <else>
                   <text prefix=". " macro="issued"/>
-                  <text prefix=", sv. " variable="volume"/>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </if>
@@ -395,7 +391,7 @@
               <text macro="title-long" suffix=". "/>
               <text macro="container"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
@@ -403,14 +399,7 @@
                 </if>
                 <else>
                   <text prefix=". " macro="issued"/>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </else-if>
@@ -428,28 +417,29 @@
                 </else>
               </choose>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
                   <text prefix=". " macro="identifier"/>
                 </if>
                 <else>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </else-if>
+            <else-if type="thesis" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" font-style="italic"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " variable="genre"/>
+              <text prefix=", " variable="publisher"/>
+              <text macro="locator-or-period"/>
+            </else-if>
             <else>
               <text macro="contributors-long" suffix=". "/>
               <text macro="title-long" font-style="italic"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=" " macro="medium"/>
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
@@ -502,12 +492,12 @@
           <text macro="contributors-full" suffix=". "/>
           <text macro="title-long" suffix=". "/>
           <text macro="container-full"/>
+          <text prefix=". " variable="volume" text-case="capitalize-first"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
@@ -521,18 +511,14 @@
                 </if>
               </choose>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page"/>
-              <text prefix=" " macro="quoted"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else-if>
             <else>
               <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else>
@@ -544,16 +530,14 @@
           <text macro="container-full"/>
           <text prefix=". " macro="issued"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
-              <text prefix=", s. " variable="page"/>
+            <if variable="URL" match="any">
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISSN" suffix="."/>
               <text prefix=". " macro="identifier"/>
             </if>
             <else>
-              <text prefix=", s. " variable="page" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="ISSN" suffix="."/>
             </else>
           </choose>
@@ -572,32 +556,36 @@
             </else>
           </choose>
           <choose>
-            <if variable="accessed DOI URL" match="any">
-              <text prefix=", s. " variable="page"/>
+            <if variable="URL" match="any">
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISSN" suffix="."/>
               <text prefix=". " macro="identifier"/>
             </if>
             <else>
-              <text prefix=", s. " variable="page" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="ISSN" suffix="."/>
             </else>
           </choose>
         </else-if>
-        <else>
+        <else-if type="thesis" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" font-style="italic"/>
+          <text prefix=". " macro="issued"/>
+          <text prefix=", " variable="genre"/>
+          <text prefix=", " variable="publisher" suffix="."/>
+        </else-if>
+        <else-if type="bill legal_case legislation" match="none">
           <text macro="contributors-full" suffix=". "/>
           <text macro="title-long" font-style="italic"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=" " macro="medium"/>
               <text prefix=". " macro="secondary-contributors"/>
               <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued"/>
               <text prefix=" " macro="quoted" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
               <text prefix=". " macro="identifier"/>
             </if>
@@ -609,7 +597,6 @@
                 </if>
               </choose>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else-if>
             <else>
@@ -617,11 +604,10 @@
               <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else>
           </choose>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>
diff --git a/masarykova-univerzita-pravnicka-fakulta.csl b/masarykova-univerzita-pravnicka-fakulta.csl
index bffd5ecb6c9e..fcbc1dfcc38c 100644
--- a/masarykova-univerzita-pravnicka-fakulta.csl
+++ b/masarykova-univerzita-pravnicka-fakulta.csl
@@ -14,7 +14,7 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Masaryk University, Faculty of Law</summary>
-    <updated>2020-05-14T10:00:00+00:00</updated>
+    <updated>2020-05-25T10:00:00+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="cs">
@@ -211,14 +211,6 @@
       </else-if>
     </choose>
   </macro>
-  <macro name="edition">
-    <choose>
-      <if variable="edition">
-        <text variable="edition" suffix="."/>
-        <text prefix=" " term="edition" form="short" suffix="."/>
-      </if>
-    </choose>
-  </macro>
   <macro name="publisher-place">
     <group delimiter="; ">
       <choose>
@@ -494,7 +486,6 @@
           <text prefix=". " variable="volume" text-case="capitalize-first"/>
           <choose>
             <if variable="URL" match="any">
-              <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
               <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
@@ -502,7 +493,6 @@
               <text prefix=". " macro="identifier"/>
             </if>
             <else-if variable="issued" match="none">
-              <text prefix=". " macro="edition" suffix="."/>
               <choose>
                 <if variable="publisher publisher-place" match="any">
                   <text prefix=". " macro="publisher"/>
@@ -514,7 +504,6 @@
               <text prefix=". " macro="collection" suffix="."/>
             </else-if>
             <else>
-              <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
               <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
@@ -575,7 +564,6 @@
           <choose>
             <if variable="URL" match="any">
               <text prefix=" " macro="medium"/>
-              <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued"/>
               <text prefix=" " macro="quoted" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
@@ -592,7 +580,6 @@
             </else-if>
             <else>
               <text prefix=" " macro="medium" suffix="."/>
-              <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
             </else>
diff --git a/pravnik.csl b/pravnik.csl
index a77f4b9a362b..4bddd272dbef 100644
--- a/pravnik.csl
+++ b/pravnik.csl
@@ -14,22 +14,34 @@
     <category citation-format="note"/>
     <category field="law"/>
     <issn>0231-6625</issn>
-    <summary>Czech ISO-690, full note, suitable for Pravnik - a journal published by the Institute of State and Law of the Czech Academy of Sciences.</summary>
-    <updated>2020-04-13T10:00:00+00:00</updated>
+    <summary>Suitable for Právník - a journal published by the Institute of State and Law of the Czech Academy of Sciences.</summary>
+    <updated>2020-05-25T10:00:00+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="cs">
     <terms>
-      <term name="et-al">et al.</term>
+      <term name="accessed" form="short">cit.</term>
       <term name="ibid">ibidem</term>
       <term name="editor" form="short">
         <single>ed.</single>
         <multiple>eds</multiple>
       </term>
-      <term name="in">In:</term>
-      <term name="page-range-delimiter">&#8211;</term>
     </terms>
   </locale>
+  <macro name="page-range">
+    <label variable="page" form="short" suffix=" "/>
+    <text variable="page"/>
+  </macro>
+  <macro name="locator-or-period">
+    <choose>
+      <if variable="locator" match="none">
+        <text value="."/>
+      </if>
+      <else>
+        <text prefix=", " macro="citation-locator" suffix="."/>
+      </else>
+    </choose>
+  </macro>
   <macro name="contributors-full">
     <choose>
       <if variable="author">
@@ -87,18 +99,6 @@
       </else-if>
     </choose>
   </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <if variable="author" type="book" match="all">
-        <names variable="editor translator" delimiter=", ">
-          <label text-case="capitalize-first" suffix=" "/>
-          <name sort-separator=", " delimiter=", " delimiter-precedes-last="never" and="text">
-            <name-part name="family" text-case="uppercase"/>
-          </name>
-        </names>
-      </if>
-    </choose>
-  </macro>
   <macro name="container-contributors">
     <choose>
       <if variable="container-author">
@@ -146,20 +146,15 @@
     </choose>
   </macro>
   <macro name="title-long">
-    <group delimiter=". ">
-      <text variable="title"/>
-      <text macro="secondary-contributors" font-style="normal"/>
-    </group>
+    <text variable="title"/>
   </macro>
   <macro name="title-short">
-    <group delimiter=". ">
-      <text variable="title" form="short"/>
-    </group>
+    <text variable="title" form="short"/>
   </macro>
   <macro name="container">
     <choose>
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
-        <text term="in" text-case="capitalize-first" suffix=" "/>
+        <text term="in" text-case="capitalize-first" suffix=":&#160;"/>
         <text macro="container-contributors" suffix=" "/>
         <choose>
           <if variable="container-title">
@@ -181,7 +176,7 @@
   <macro name="container-full">
     <choose>
       <if type="chapter entry entry-dictionary entry-encyclopedia webpage" match="any">
-        <text term="in" text-case="capitalize-first" suffix=" "/>
+        <text term="in" text-case="capitalize-first" suffix=": "/>
         <text macro="container-contributors-full" suffix=" "/>
         <choose>
           <if variable="container-title">
@@ -204,27 +199,15 @@
     <choose>
       <if variable="edition">
         <text variable="edition" suffix="."/>
-        <text prefix=" " term="edition" form="short" suffix="."/>
+        <text prefix=" " term="edition" form="long"/>
       </if>
     </choose>
   </macro>
   <macro name="publisher-place">
-    <group delimiter="; ">
-      <choose>
-        <if variable="publisher-place accessed DOI URL" match="any">
-          <text variable="publisher-place"/>
-        </if>
-      </choose>
-    </group>
+    <text variable="publisher-place"/>
   </macro>
   <macro name="printers">
-    <group delimiter="; ">
-      <choose>
-        <if variable="publisher accessed DOI URL" match="any">
-          <text variable="publisher"/>
-        </if>
-      </choose>
-    </group>
+    <text variable="publisher"/>
   </macro>
   <macro name="publisher">
     <group delimiter=": ">
@@ -235,39 +218,46 @@
   <macro name="issued">
     <choose>
       <if type="article-journal article-magazine article-newspaper" match="any">
-        <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
-        </date>
-        <choose>
-          <if variable="volume">
-            <text prefix=", " term="volume" form="short" suffix=". "/>
-            <text variable="volume"/>
-          </if>
-        </choose>
+        <group delimiter=", ">
+          <date variable="issued">
+            <date-part name="year" range-delimiter="&#8211;"/>
+          </date>
+          <choose>
+            <if variable="volume">
+              <text term="volume" form="short" suffix="&#160;"/>
+              <text variable="volume"/>
+            </if>
+          </choose>
+        </group>
         <choose>
           <if variable="issue">
-            <text prefix=", " term="issue" form="short" suffix=". "/>
+            <text prefix=", " term="issue" form="short" suffix="&#160;"/>
             <text variable="issue"/>
           </if>
         </choose>
       </if>
       <else-if type="webpage" match="any">
         <date variable="issued">
-          <date-part name="day" suffix=". "/>
-          <date-part name="month" suffix=". " form="numeric"/>
+          <date-part name="day" suffix=".&#160;"/>
+          <date-part name="month" suffix=".&#160;" form="numeric"/>
           <date-part name="year"/>
         </date>
       </else-if>
+      <else-if type="entry entry-dictionary entry-encyclopedia thesis" match="any">
+        <date variable="issued">
+          <date-part name="year" range-delimiter="&#8211;"/>
+        </date>
+      </else-if>
       <else>
         <text prefix=" " macro="publisher" suffix=", "/>
         <date variable="issued">
-          <date-part name="year" range-delimiter=" &#8211; "/>
+          <date-part name="year" range-delimiter="&#8211;"/>
         </date>
       </else>
     </choose>
   </macro>
   <macro name="citation-locator">
-    <label variable="locator" form="short" suffix=". "/>
+    <label variable="locator" form="short" suffix="&#160;"/>
     <text variable="locator"/>
   </macro>
   <macro name="collection">
@@ -282,40 +272,49 @@
   <macro name="ISBN">
     <choose>
       <if variable="ISBN">
-        <text variable="ISBN" prefix="ISBN "/>
+        <text variable="ISBN" prefix="ISBN&#160;"/>
       </if>
     </choose>
   </macro>
   <macro name="identifier">
-    <group delimiter="; " suffix=".">
-      <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="DOI: "/>
-        </if>
-        <else>
-          <text variable="URL" prefix="Dostupné z: &lt;" suffix="&gt;"/>
-        </else>
-      </choose>
-    </group>
-  </macro>
-  <macro name="medium">
     <choose>
-      <if variable="accessed DOI URL" match="any">
-        <text term="online" prefix="[" suffix="]"/>
+      <if variable="DOI">
+        <text variable="DOI" prefix="DOI:&#160;"/>
       </if>
       <else>
-        <text variable="archive" prefix="[" suffix="]"/>
+        <text term="available at" text-case="capitalize-first" suffix=":&#160;"/>
+        <text variable="URL" prefix="&lt;" suffix="&gt;"/>
       </else>
     </choose>
   </macro>
+  <macro name="medium">
+    <choose>
+      <if variable="URL" match="any">
+        <choose>
+          <if variable="DOI" match="none">
+            <text term="online" prefix="[" suffix="]"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
   <macro name="quoted">
-    <group prefix="[cit. " suffix="]">
-      <date variable="accessed">
-        <date-part name="year" suffix="-"/>
-        <date-part name="month" suffix="-" form="numeric-leading-zeros"/>
-        <date-part name="day" form="numeric-leading-zeros"/>
-      </date>
-    </group>
+    <choose>
+      <if variable="URL" match="any">
+        <choose>
+          <if variable="DOI" match="none">
+            <group prefix="[" suffix="]">
+              <text term="accessed" form="short" suffix="&#160;"/>
+              <date variable="accessed">
+                <date-part name="year" suffix="-"/>
+                <date-part name="month" suffix="-" form="numeric-leading-zeros"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
+              </date>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
   </macro>
   <citation et-al-min="4" et-al-use-first="1" disambiguate-add-names="true">
     <layout delimiter="; ">
@@ -327,21 +326,12 @@
           </group>
         </if>
         <else-if position="ibid">
-          <text term="ibid" suffix="."/>
+          <text term="ibid"/>
         </else-if>
         <else-if position="subsequent">
           <text macro="contributors-short" suffix=". "/>
           <text macro="title-short" font-style="italic"/>
-          <choose>
-            <if variable="locator">
-              <text prefix=", " macro="citation-locator" suffix="."/>
-            </if>
-            <else-if variable="accessed URL DOI" match="any">
-              <text term="online" prefix=" [" suffix="] "/>
-              <text macro="quoted"/>
-              <text prefix=". " macro="identifier"/>
-            </else-if>
-          </choose>
+          <text macro="locator-or-period"/>
         </else-if>
         <else>
           <choose>
@@ -349,10 +339,10 @@
               <text macro="contributors-long" suffix=". "/>
               <text macro="title-long" suffix=". "/>
               <text macro="container"/>
+              <text prefix=". " variable="volume" text-case="capitalize-first"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=". " macro="issued"/>
-                  <text prefix=", sv. " variable="volume"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
                   <text prefix=". " macro="identifier"/>
@@ -363,26 +353,11 @@
                       <text prefix=". " macro="publisher"/>
                     </if>
                   </choose>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else-if>
                 <else>
                   <text prefix=". " macro="issued"/>
-                  <text prefix=", sv. " variable="volume"/>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </if>
@@ -391,7 +366,7 @@
               <text macro="title-long" suffix=". "/>
               <text macro="container"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
@@ -399,14 +374,7 @@
                 </if>
                 <else>
                   <text prefix=". " macro="issued"/>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </else-if>
@@ -416,28 +384,29 @@
               <text macro="container"/>
               <text prefix=". " macro="issued"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
                   <text prefix=". " macro="identifier"/>
                 </if>
                 <else>
-                  <choose>
-                    <if variable="locator" match="none">
-                      <text value="."/>
-                    </if>
-                    <else>
-                      <text prefix=", " macro="citation-locator" suffix="."/>
-                    </else>
-                  </choose>
+                  <text macro="locator-or-period"/>
                 </else>
               </choose>
             </else-if>
+            <else-if type="thesis" match="any">
+              <text macro="contributors-long" suffix=". "/>
+              <text macro="title-long" font-style="italic"/>
+              <text prefix=". " macro="issued"/>
+              <text prefix=", " variable="genre"/>
+              <text prefix=", " variable="publisher"/>
+              <text macro="locator-or-period"/>
+            </else-if>
             <else>
               <text macro="contributors-long" suffix=". "/>
               <text macro="title-long" font-style="italic"/>
               <choose>
-                <if variable="accessed DOI URL" match="any">
+                <if variable="URL" match="any">
                   <text prefix=" " macro="medium"/>
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
@@ -490,12 +459,12 @@
           <text macro="contributors-full" suffix=". "/>
           <text macro="title-long" suffix=". "/>
           <text macro="container-full"/>
+          <text prefix=". " variable="volume" text-case="capitalize-first"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
@@ -509,18 +478,14 @@
                 </if>
               </choose>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page"/>
-              <text prefix=" " macro="quoted"/>
+              <text prefix=", " macro="page-range"/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else-if>
             <else>
               <text prefix=". " macro="edition"/>
               <text prefix=". " macro="issued"/>
-              <text prefix=", sv. " variable="volume"/>
-              <text prefix=", s. " variable="page" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else>
@@ -532,30 +497,33 @@
           <text macro="container-full"/>
           <text prefix=". " macro="issued"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
-              <text prefix=", s. " variable="page"/>
+            <if variable="URL" match="any">
+              <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="identifier"/>
             </if>
             <else>
-              <text prefix=", s. " variable="page" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
+              <text prefix=", " macro="page-range" suffix="."/>
             </else>
           </choose>
         </else-if>
-        <else>
+        <else-if type="thesis" match="any">
+          <text macro="contributors-full" suffix=". "/>
+          <text macro="title-long" font-style="italic"/>
+          <text prefix=". " macro="issued"/>
+          <text prefix=", " variable="genre"/>
+          <text prefix=", " variable="publisher" suffix="."/>
+        </else-if>
+        <else-if type="bill legal_case legislation" match="none">
           <text macro="contributors-full" suffix=". "/>
           <text macro="title-long" font-style="italic"/>
           <choose>
-            <if variable="accessed DOI URL" match="any">
+            <if variable="URL" match="any">
               <text prefix=" " macro="medium"/>
-              <text prefix=". " macro="secondary-contributors"/>
               <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued"/>
               <text prefix=" " macro="quoted" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
               <text prefix=". " macro="identifier"/>
             </if>
@@ -567,7 +535,6 @@
                 </if>
               </choose>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else-if>
             <else>
@@ -575,11 +542,10 @@
               <text prefix=". " macro="edition" suffix="."/>
               <text prefix=". " macro="issued" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
-              <text prefix=". " variable="note" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
             </else>
           </choose>
-        </else>
+        </else-if>
       </choose>
     </layout>
   </bibliography>