diff --git a/afro-asia.csl b/afro-asia.csl
index 408dc49a275..2c9baf7ee2d 100644
--- a/afro-asia.csl
+++ b/afro-asia.csl
@@ -146,7 +146,7 @@
   <!-- principais -->
   <macro name="producers">
     <names variable="author">
-      <name form="long" sort-separator=", "></name>
+      <name form="long" sort-separator=", "/>
       <et-al term="et-al" prefix=" " font-style="italic"/>
       <substitute>
         <text macro="container-producers"/>
@@ -155,7 +155,7 @@
   </macro>
   <macro name="producers-short">
     <names variable="author">
-      <name form="short"></name>
+      <name form="short"/>
       <et-al term="et-al" prefix=" " suffix="." font-style="italic"/>
       <substitute>
         <text macro="container-producers-short"/>
@@ -177,7 +177,7 @@
   <!-- da obra principal, em caso de parte -->
   <macro name="container-producers">
     <names variable="editor">
-      <name form="long" sort-separator=", "></name>
+      <name form="long" sort-separator=", "/>
       <et-al term="et-al" prefix=" " font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
@@ -187,7 +187,7 @@
   </macro>
   <macro name="container-producers-short">
     <names variable="editor">
-      <name form="short"></name>
+      <name form="short"/>
       <et-al term="et-al" prefix=" " font-style="italic"/>
       <label form="short" prefix=" (" suffix=")" text-case="lowercase"/>
       <substitute>
diff --git a/american-physical-society-et-al.csl b/american-physical-society-et-al.csl
index b95e4557e14..601ce11c5d3 100644
--- a/american-physical-society-et-al.csl
+++ b/american-physical-society-et-al.csl
@@ -28,7 +28,6 @@
       </substitute>
     </names>
   </macro>
-
   <macro name="editor">
     <names variable="editor">
       <label form="verb" suffix=" "/>
diff --git a/american-physics-society-without-titles.csl b/american-physics-society-without-titles.csl
index c15bea341e8..9d9bc105ed5 100644
--- a/american-physics-society-without-titles.csl
+++ b/american-physics-society-without-titles.csl
@@ -169,7 +169,7 @@
             <else>
               <text variable="number"/>
             </else>
-          </choose>    
+          </choose>
         </else-if>
         <else-if type="dataset interview manuscript pamphlet personal_communication post post-weblog speech webpage">
           <!-- unpublished materials; guidelines call for 'enough information to be retrievable' -->
diff --git a/american-physics-society.csl b/american-physics-society.csl
index b8212e7e441..e5a28cce9a4 100644
--- a/american-physics-society.csl
+++ b/american-physics-society.csl
@@ -166,7 +166,7 @@
               <else>
                 <text variable="number"/>
               </else>
-            </choose>          
+            </choose>
           </group>
         </else-if>
         <else-if type="dataset interview manuscript pamphlet personal_communication post post-weblog speech webpage">
@@ -187,7 +187,7 @@
             </choose>
           </group>
         </else-if>
-        <else> 
+        <else>
           <!--article-journal article-magazine article-newspaper review review-book-->
           <group delimiter=", ">
             <text variable="title" text-case="title" font-style="italic"/>
diff --git a/annual-review-of-astronomy-and-astrophysics.csl b/annual-review-of-astronomy-and-astrophysics.csl
index ebc3d9330da..a5a2d031c6f 100644
--- a/annual-review-of-astronomy-and-astrophysics.csl
+++ b/annual-review-of-astronomy-and-astrophysics.csl
@@ -255,7 +255,7 @@
       <else-if type="webpage" match="any">
         <group delimiter=". ">
           <text variable="container-title"/>
-          <text variable="URL" form="short"/>
+          <text variable="URL"/>
         </group>
       </else-if>
       <else-if type="manuscript">
diff --git a/associacao-brasileira-de-normas-tecnicas-ufrgs.csl b/associacao-brasileira-de-normas-tecnicas-ufrgs.csl
index 15ee7cf73da..453d72bb236 100644
--- a/associacao-brasileira-de-normas-tecnicas-ufrgs.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ufrgs.csl
@@ -1,13 +1,28 @@
 <?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="never" page-range-format="expanded" initialize="false" default-locale="pt-BR">
+<!-- XML Declaration: não é preciso alterar -->
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="never" page-range-format="expanded" initialize="true" default-locale="pt-BR">
   <info>
     <title>Universidade Federal do Rio Grande do Sul - ABNT (autoria completa) (Portuguese - Brazil)</title>
     <title-short>UFRGS-ABNT</title-short>
     <id>http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs</id>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs" rel="self"/>
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ipea" rel="template"/>
+    <!-- Estilo original utilizado como modelo -->
+    <!-- Para autor ficar com nome completo, é necessário preencher com nome completo dos autores na biblioteca. Ver documentação sobre preenchimento dos campos básicos para ABNT -->
     <link href="https://www.ufrgs.br/bibliotecas/campos-basicos-abnt-mendeley" rel="documentation"/>
+    <!-- Para alguns itens do Mendeley é necessário incluir novos campos -->
     <link href="https://www.ufrgs.br/bibliotecas/campos-basicos-abnt-zotero" rel="documentation"/>
+    <!-- Para alguns itens do Zotero é necessário utilizar o campo "extra". Exemplo: incluir "publisher-place:" para artigos de periódico.  -->
+    <author>
+      <name>Priscila Saraiva Jacobsen</name>
+      <email>jacobsen@bc.ufrgs.br</email>
+      <uri>https://www.ufrgs.br/bibliotecas/</uri>
+    </author>
+    <author>
+      <name>Luísia Feichas Alves</name>
+      <email>luisia.alves@bc.ufrgs.br</email>
+      <uri>https://www.zotero.org/luisiafalves</uri>
+    </author>
     <author>
       <name>José Antonio Meira da Rocha</name>
       <email>joseantoniorocha@gmail.com</email>
@@ -18,14 +33,6 @@
       <email>fernando.bruno@ufrgs.br</email>
       <uri>http://www.pgdesign.ufrgs.br/</uri>
     </author>
-    <author>
-      <name>Priscila Saraiva Jacobsen</name>
-      <email>jacobsen@bc.ufrgs.br</email>
-    </author>
-    <author>
-      <name>Luísia Alves</name>
-      <email>luisia.alves@bc.ufrgs.br</email>
-    </author>
     <author>
       <name>Kelson Anthony de Menezes</name>
       <email>kanthony@ebsco.com</email>
@@ -43,196 +50,292 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>The Brazilian Standard Style in accordance with ABNT-NBR 10520.2002 and ABNT-NBR 6023.2018</summary>
-    <updated>2020-03-05T09:37:20+00:00</updated>
+    <updated>2020-10-06T01:42:52+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="pt-BR">
     <terms>
-      <term name="month-01" form="short">jan.</term>
-      <term name="month-02" form="short">fev.</term>
-      <term name="month-03" form="short">mar.</term>
-      <term name="month-04" form="short">abr.</term>
-      <term name="month-05" form="short">maio</term>
-      <term name="month-06" form="short">jun.</term>
-      <term name="month-07" form="short">jul.</term>
-      <term name="month-08" form="short">ago.</term>
-      <term name="month-09" form="short">set.</term>
-      <term name="month-10" form="short">out.</term>
-      <term name="month-11" form="short">nov.</term>
-      <term name="month-12" form="short">dez.</term>
-      <!--ABNT 6023:2018 - 8.1.1.4 sempre no singular-->
-      <term name="editor" form="short">org.</term>
-      <!--usando editor de coleção para quando for editor do livro-->
-      <term name="collection-editor" form="short">ed.</term>
+      <term name="editor" form="short">org</term>
+      <!-- ABNT 6023:2018 - 8.1.1.4 sempre no singular -->
+      <term name="collection-editor" form="short">ed</term>
+      <!-- usando editor de coleção para quando for editor do livro -->
+      <term name="accessed">acesso</term>
+      <term name="available at">disponível em</term>
+      <term name="composer">compositor</term>
+      <term name="recipient">destinatário</term>
+      <term name="interviewer">entrevistador</term>
+      <term name="director">direção</term>
+      <term name="translator">tradução</term>
+      <term name="volume" form="short">
+        <single>v.</single>
+        <multiple>v.</multiple>
+      </term>
+      <term name="issue" form="short">n.</term>
     </terms>
   </locale>
   <macro name="container-contributors">
+    <!-- Macro responsavel por mostrar os nomes dos organizadores ou editores -->
     <choose>
-      <if type="chapter">
+      <if type="chapter entry-dictionary entry-encyclopedia">
         <names variable="container-author" delimiter=", ">
-          <name name-as-sort-order="all" sort-separator=", " initialize-with=". " delimiter="; " delimiter-precedes-last="always">
+          <name name-as-sort-order="all" sort-separator=", " delimiter="; " delimiter-precedes-last="always">
             <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
           </name>
           <label form="short" prefix=" (" suffix=".)"/>
           <et-al font-style="italic"/>
           <substitute>
-            <!--ABNT 6023:2018 - quando for organizador-->
             <names variable="editor"/>
-            <!--ABNT 6023:2018 - quando for editor, mesmo que apenas do livro no todo-->
+            <!-- ABNT 6023:2018 - quando for organizador -->
             <names variable="collection-editor"/>
+            <!-- ABNT 6023:2018 - quando for editor, mesmo que apenas do livro no todo -->
           </substitute>
         </names>
       </if>
     </choose>
   </macro>
   <macro name="secondary-contributors">
+    <!-- Macro responsavel por mostrar os nomes dos organizadores do livro no todo quando um capítulo de livro -->
     <choose>
       <if type="chapter" match="none">
         <names variable="editor" delimiter="; " prefix=" (" suffix=")">
-          <name initialize-with=". " delimiter=", "/>
+          <name and="symbol" delimiter=", "/>
           <label form="short" prefix=", " text-case="capitalize-first" suffix="."/>
         </names>
       </if>
     </choose>
   </macro>
-  <macro name="translator">
-    <text value="Tradução "/>
-    <names variable="translator" delimiter="; ">
-      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
-      <et-al font-style="italic"/>
-    </names>
+  <macro name="author">
+    <!-- Macro responsavel por mostrar o autor -->
+    <choose>
+      <if type="broadcast" match="any">
+        <!-- para transmissões é apresentador -->
+        <text value="Apresentado por "/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </if>
+      <else-if type="motion_picture" match="any">
+        <!-- para filmes é o diretor -->
+        <text term="director" suffix=": " text-case="capitalize-first"/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if type="song" match="any">
+        <!-- para músicas é o intérprete -->
+        <text value="Intérprete: "/>
+        <names variable="author">
+          <name delimiter=" e ">
+            <name-part name="given" text-case="capitalize-first"/>
+            <name-part name="family" text-case="capitalize-first"/>
+          </name>
+        </names>
+      </else-if>
+      <else-if type="entry-dictionary entry-encyclopedia" match="any">
+        <names variable="author">
+          <!-- para outros tipos de documentos mantém a posição original -->
+          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
+          <substitute>
+            <!-- na ausência de um autor, utiliza organizador, editor, tradutor ou título  -->
+            <text variable="title" text-case="uppercase"/>
+          </substitute>
+        </names>
+      </else-if>
+      <else>
+        <names variable="author">
+          <!-- para outros tipos de documentos mantém a posição original -->
+          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
+          <substitute>
+            <!-- na ausência de um autor, utiliza organizador, editor, tradutor ou título  -->
+            <names variable="editor"/>
+            <names variable="collection-editor"/>
+            <names variable="translator"/>
+            <text variable="title" text-case="uppercase"/>
+          </substitute>
+        </names>
+      </else>
+    </choose>
   </macro>
   <macro name="composer">
-    <text value="Compositor: "/>
+    <!-- Macro responsavel por mostrar o nome do compositor -->
+    <text term="composer" suffix=": " text-case="capitalize-first"/>
     <names variable="composer" delimiter="; ">
       <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
+  <macro name="interviewer">
+    <!-- Macro responsavel por mostrar o nome do entrevistador -->
+    <text term="interviewer" suffix=": " text-case="capitalize-first"/>
+    <names variable="interviewer" delimiter="; ">
+      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
+      <et-al font-style="italic"/>
+    </names>
+  </macro>
   <macro name="recipient">
-    <text value="Destinatário: "/>
+    <!-- Macro responsavel por mostrar o nome do destinatário -->
+    <text term="recipient" suffix=": " text-case="capitalize-first"/>
     <names variable="recipient" delimiter="; ">
       <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
-  <macro name="interviewer">
-    <text value="Entrevistador: "/>
-    <names variable="interviewer" delimiter="; ">
-      <name delimiter=" e " sort-separator=" " delimiter-precedes-last="always"/>
+  <macro name="translator">
+    <!-- Macro responsavel por mostrar o nome do tradutor -->
+    <text term="translator" suffix=": " text-case="capitalize-first"/>
+    <names variable="translator" delimiter=", ">
+      <name delimiter="; " sort-separator=" " delimiter-precedes-last="always"/>
       <et-al font-style="italic"/>
     </names>
   </macro>
-  <macro name="author">
+  <macro name="author-short">
+    <!-- Macro responsável por mostrar o autor na citação -->
     <choose>
-      <if type="motion_picture broadcast song" match="any">
-        <names variable="author">
-          <name/>
-        </names>
+      <if type="broadcast motion_picture song" match="any">
+        <text variable="title" form="short" text-case="uppercase" quotes="false"/>
       </if>
       <else>
         <names variable="author">
-          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="always" initialize-with=". " name-as-sort-order="all">
+          <name form="short" delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
             <name-part name="family" text-case="uppercase"/>
+            <name-part name="given" text-case="capitalize-first"/>
           </name>
           <et-al font-style="italic"/>
-          <label form="short" text-case="lowercase" prefix=" (" suffix=".)"/>
           <substitute>
             <names variable="editor"/>
-            <names variable="collection-editor"/>
             <names variable="translator"/>
-            <text macro="title"/>
+            <choose>
+              <if type="book">
+                <!-- uso do título quando não houver autor -->
+                <text variable="title" form="short" text-case="uppercase"/>
+              </if>
+              <else>
+                <text variable="title" form="short" text-case="uppercase" quotes="false"/>
+              </else>
+            </choose>
           </substitute>
         </names>
       </else>
     </choose>
   </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
-        <name-part name="family" text-case="uppercase"/>
-        <name-part name="given" text-case="uppercase"/>
-      </name>
-      <et-al font-style="italic"/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <choose>
-          <if type="book">
-            <text variable="title" form="short"/>
-          </if>
-          <else-if type="broadcast song motion_picture" match="any">
-            <text variable="title"/>
-          </else-if>
-          <else>
-            <text variable="title" form="short" text-case="uppercase" quotes="false"/>
-          </else>
-        </choose>
-      </substitute>
-    </names>
-  </macro>
   <macro name="access">
-    <choose>
-      <if type="book chapter">
-        <text value="E-book" font-style="italic" suffix="."/>
-      </if>
-    </choose>
+    <!-- Macro utilizada para apresentar a URL do site utilizado e data de acesso -->
     <choose>
       <if variable="DOI" match="any">
-        <text variable="DOI" prefix=" Disponível em: https://doi.org/"/>
-        <group prefix=". Acesso em: " suffix=".">
-          <date variable="accessed">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" form="short" suffix=". "/>
-            <date-part name="year"/>
-          </date>
+        <!-- Quando houver DOI, utilizá-lo no lugar do link -->
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="DOI" prefix="https://doi.org/"/>
+        <group>
+          <text term="accessed" text-case="capitalize-first" prefix=". " suffix=" "/>
+          <text term="at" text-case="lowercase" suffix=": "/>
+          <text macro="accessed"/>
         </group>
       </if>
       <else-if variable="URL">
-        <text variable="URL" prefix=" Disponível em: "/>
-        <group prefix=". Acesso em: " suffix=".">
-          <date variable="accessed">
-            <date-part name="day" suffix=" "/>
-            <date-part name="month" form="short" suffix=". "/>
-            <date-part name="year"/>
-          </date>
-        </group>
+        <choose>
+          <if type="book chapter">
+            <!-- Quando for livro, incluir a expressão e-book em itálico -->
+            <text value="E-book" font-style="italic" suffix="."/>
+          </if>
+          <else>
+            <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+            <text variable="URL"/>
+            <group>
+              <!-- formato de acesso utiliza a macro accessed -->
+              <text term="accessed" text-case="capitalize-first" prefix=". " suffix=" "/>
+              <text term="at" text-case="lowercase" suffix=": "/>
+              <text macro="accessed"/>
+            </group>
+          </else>
+        </choose>
       </else-if>
     </choose>
   </macro>
+  <macro name="accessed">
+    <!-- Macro utilizada para a data de acesso -->
+    <date variable="accessed" suffix=".">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" form="short" suffix=" "/>
+      <date-part name="year" prefix=" "/>
+    </date>
+  </macro>
   <macro name="title">
+    <!-- Macro responsável por mostrar o título principal de um documento dependendo do tipo. Ainda não é possível diferenciar título de subtítulo -->
     <choose>
-      <if type="chapter article-newspaper article-magazine article-journal paper-conference post-weblog" match="any">
+      <if type="article-journal article-magazine article-newspaper chapter paper-conference post-weblog" match="any">
         <text variable="title" font-weight="normal"/>
       </if>
-      <else-if type="book thesis patent report" match="any">
+      <else-if type="book entry-dictionary entry-encyclopedia patent report thesis" match="any">
         <text variable="title" font-weight="bold"/>
       </else-if>
-      <else-if type="entry-encyclopedia entry-dictionary" match="any">
-        <text variable="title" text-case="uppercase"/>
-      </else-if>
       <else-if type="dataset" match="any">
         <text variable="title" suffix=". "/>
       </else-if>
-      <else-if type="legislation bill legal_case" match="any">
+      <else-if type="bill legal_case legislation" match="any">
         <text variable="title" font-weight="bold"/>
       </else-if>
-      <else-if type="motion_picture broadcast song" match="any">
+      <else-if type="broadcast motion_picture song" match="any">
         <text variable="title" text-case="uppercase" suffix=". "/>
       </else-if>
       <else>
-        <text variable="title" font-weight="bold" suffix=". "/>
+        <text variable="title" font-weight="bold" text-case="capitalize-first" suffix=". "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="event">
+    <!-- Macro responsável por mostrar o título de evento -->
+    <choose>
+      <if type="paper-conference" match="any">
+        <group suffix=". ">
+          <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
+          <choose>
+            <if variable="event" match="any">
+              <text variable="event" text-case="uppercase"/>
+            </if>
+            <else>
+              <text variable="title-short" text-case="uppercase"/>
+              <!--title-short utilizado para nome do evento no Mendeley-->
+            </else>
+          </choose>
+          <text variable="number" prefix=", " suffix="."/>
+          <text macro="issued-year" prefix=", "/>
+          <text macro="event-place" prefix=", "/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event-place">
+    <!-- Macro responsável por mostrar o local do evento. No Zotero utilizar o campo extra quando local de evento e de publicação forem diferentes -->
+    <choose>
+      <if variable="event-place" match="any">
+        <text variable="event-place"/>
+      </if>
+      <else>
+        <text variable="publisher-place"/>
       </else>
     </choose>
   </macro>
   <macro name="container-title">
+    <!-- Macro responsável por mostrar o título do todo, quando parte de um documento -->
     <choose>
       <if type="paper-conference" match="any">
-        <text variable="event" text-case="uppercase"/>
-        <text variable="title-short" text-case="uppercase"/>
-        <text variable="number" prefix=", " suffix=". , "/>
-        <text macro="issued-year" prefix=" " suffix=", "/>
-        <text variable="publisher-place" suffix=". "/>
         <choose>
           <if match="any" variable="container-title">
             <text variable="container-title" font-weight="bold" suffix=". "/>
@@ -245,105 +348,121 @@
       <else-if type="legal_case" match="any">
         <text variable="container-title"/>
       </else-if>
+      <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
+        <choose>
+          <if variable="container-author editor collection-editor" match="any">
+            <text variable="container-title" font-weight="bold"/>
+          </if>
+          <else>
+            <text variable="container-title" text-case="uppercase"/>
+          </else>
+        </choose>
+      </else-if>
       <else>
         <text variable="container-title" font-weight="bold"/>
       </else>
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- Macro responsável por mostrar os responsáveis pela publicação. No caso de ausência deles, incluir expressões para sem local ou sem editor -->
     <choose>
-      <if match="any" variable="publisher-place publisher">
+      <if variable="publisher-place publisher" match="any">
         <choose>
           <if variable="publisher-place">
             <text variable="publisher-place"/>
           </if>
-          <else-if type="entry-encyclopedia thesis" match="any"/>
-          <else-if type="paper-conference" match="any">
-            <text variable="publisher-place" suffix=". "/>
-          </else-if>
           <else>
-            <text value="[S. l.]" font-style="italic"/>
-          </else>
-        </choose>
-        <choose>
-          <if variable="publisher">
-            <text variable="publisher" prefix=": " suffix=","/>
-            <text macro="issued"/>
-          </if>
-          <else>
-            <text value=" [s. n.]" font-style="italic" prefix=": " suffix=","/>
-            <text macro="issued"/>
+            <text value="s. l." font-style="italic" prefix="[" suffix="]" text-case="capitalize-first"/>
           </else>
         </choose>
+        <group prefix=": " suffix=",">
+          <choose>
+            <if variable="publisher">
+              <text variable="publisher"/>
+            </if>
+            <else>
+              <text value="s. n." font-style="italic" prefix="[" suffix="]"/>
+            </else>
+          </choose>
+        </group>
+        <text macro="issued" prefix=" "/>
       </if>
       <else>
-        <text value="[S. l.: s. n.]" font-style="italic"/>
+        <text value="s. l.: s. n." font-style="italic" prefix="[" suffix="]" text-case="capitalize-first"/>
+        <text macro="issued" prefix=", "/>
       </else>
     </choose>
   </macro>
-  <macro name="event">
-    <choose>
-      <if variable="genre" match="none">
-        <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
-        <text variable="event" text-case="uppercase"/>
-      </if>
-    </choose>
-  </macro>
   <macro name="issued">
-    <choose>
-      <if variable="issued" match="any">
-        <choose>
-          <if type="patent song post-weblog article-newspaper personal_communication" match="any">
-            <date variable="issued" prefix=" " suffix=".">
-              <date-part name="day" suffix=" "/>
-              <date-part name="month" form="short" suffix=" "/>
-              <date-part name="year"/>
-            </date>
-          </if>
-          <else>
-            <date variable="issued" suffix=".">
-              <date-part name="year" prefix=" "/>
-            </date>
-          </else>
-        </choose>
-      </if>
-      <else>
-        <text value=" [s. d.]" font-style="italic"/>
-      </else>
-    </choose>
+    <!-- Macro responsável por mostrar a data completa de um documento -->
+    <group suffix=". ">
+      <choose>
+        <if is-uncertain-date="issued">
+          <date variable="issued">
+            <date-part name="year" prefix="[" suffix="]"/>
+          </date>
+        </if>
+        <else-if variable="issued" match="any">
+          <choose>
+            <if type="article-newspaper bill interview manuscript patent personal_communication post-weblog song" match="any">
+              <date variable="issued">
+                <date-part name="day" suffix=" "/>
+                <date-part name="month" form="short" suffix=" "/>
+              </date>
+            </if>
+          </choose>
+          <date variable="issued" date-parts="year" form="numeric" prefix=" "/>
+        </else-if>
+        <else>
+          <choose>
+            <if type="article-journal">
+              <text variable="status" font-style="italic"/>
+            </if>
+            <else>
+              <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
+            </else>
+          </choose>
+        </else>
+      </choose>
+    </group>
   </macro>
   <macro name="issued-year">
+    <!-- Macro responsável por mostrar apenas o ano -->
     <choose>
-      <if variable="issued" match="any">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
+      <if variable="event-date" match="any">
+        <date date-parts="year" form="numeric" variable="event-date" prefix=" "/>
       </if>
-      <else-if type="paper-conference" match="all">
-        <date date-parts="year" form="numeric" variable="issued">
-          <date-part name="year"/>
+      <else-if is-uncertain-date="issued">
+        <date variable="issued">
+          <date-part name="year" prefix="[" suffix="]"/>
         </date>
       </else-if>
+      <else-if variable="issued" match="any">
+        <date date-parts="year" form="numeric" variable="issued" prefix=" "/>
+      </else-if>
       <else>
-        <text value=" [s. d.]" font-style="italic"/>
+        <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
       </else>
     </choose>
   </macro>
   <macro name="issued-legislation">
+    <!-- Macro responsável por mostrar a data para documentos legislativos -->
     <date variable="issued">
       <date-part name="day" suffix=" "/>
       <date-part name="month" form="short" suffix=". " text-case="lowercase"/>
-      <date-part name="year"/>
+      <date-part name="year" prefix=" "/>
     </date>
   </macro>
   <macro name="submitted">
+    <!-- Macro responsável por mostrar a data de submissão de um documento. Utilizado para patente como data de depósito -->
     <date variable="submitted" prefix=" " suffix=".">
       <date-part name="day" suffix=" "/>
       <date-part name="month" form="short" suffix=" "/>
-      <date-part name="year"/>
+      <date-part name="year" prefix=" "/>
     </date>
   </macro>
   <macro name="edition">
+    <!-- Macro responsável por mostrar o número da edição. Atualmente sem diferenciar a língua do documento para apresentar as edições -->
     <choose>
       <if type="book chapter" match="any">
         <choose>
@@ -354,120 +473,204 @@
             </group>
           </if>
           <else>
-            <text variable="edition" suffix=" ed."/>
+            <text variable="edition"/>
+            <text term="edition" form="short" suffix="."/>
           </else>
         </choose>
       </if>
     </choose>
   </macro>
   <macro name="locators">
+    <!-- Macro responsável por mostrar os dados complementares do documento -->
     <choose>
       <if type="bill">
+        <!-- Se for legislação utilizará o que foi definido nas macros "issued" e "section" adicionará a variável "page" -->
         <group prefix=". " delimiter=", ">
-          <date variable="issued">
-            <date-part name="day"/>
-            <date-part prefix=" " name="month" form="short"/>
-            <date-part prefix=" " name="year"/>
-          </date>
+          <text macro="issued"/>
           <text macro="section"/>
-          <text variable="page" prefix="p. " suffix="."/>
+          <group>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page" suffix="."/>
+          </group>
         </group>
       </if>
       <else-if match="any" type="article-journal article-magazine">
+        <!-- Se for artigo de periódigo ou revista, utiliza os termos padrões para volume e número -->
         <group delimiter=", ">
-          <group delimiter=", ">
-            <text variable="volume" prefix="v. "/>
-            <text variable="issue" prefix="n. "/>
+          <group>
+            <text term="volume" form="short" suffix=" "/>
+            <text variable="volume"/>
+          </group>
+          <group>
+            <text term="issue" form="short" suffix=" "/>
+            <text variable="issue"/>
           </group>
           <text variable="collection-title"/>
-          <text variable="page" prefix="p. "/>
-        </group>
-      </else-if>
-      <else-if match="any" type="book chapter">
-        <group delimiter=", ">
           <group>
-            <text variable="volume" prefix="v. "/>
-            <text variable="page" prefix="p. "/>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page"/>
           </group>
         </group>
       </else-if>
       <else-if type="article-newspaper" match="any">
+        <!-- Se for artigo de jornal, utiliza termo específico para volume -->
         <group>
-          <text variable="volume" prefix="ano " suffix=", "/>
-          <text variable="issue" prefix="n. " suffix=", "/>
-          <text macro="issued-legislation"/>
+          <group delimiter=", ">
+            <text variable="volume" prefix="ano "/>
+            <group>
+              <text term="issue" form="short" suffix=" "/>
+              <text variable="issue"/>
+            </group>
+            <text macro="issued"/>
+          </group>
+          <group delimiter=", " suffix=".">
+            <text variable="section"/>
+            <text variable="collection-title"/>
+            <group>
+              <text term="page" form="short" suffix=" "/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </group>
+      </else-if>
+      <else-if match="any" type="book chapter">
+        <!-- Se for livro ou capítulo, utiliza os termos padrões para volume e página -->
+        <group delimiter=", ">
+          <group>
+            <text term="volume" form="short" suffix=" "/>
+            <text variable="volume"/>
+          </group>
+          <group>
+            <text term="page" form="short" suffix=" "/>
+            <text variable="page"/>
+          </group>
         </group>
-        <text variable="section" prefix=". "/>
-        <text variable="collection-title" prefix=". "/>
-        <text variable="page" prefix=", p. " suffix="."/>
       </else-if>
     </choose>
   </macro>
   <macro name="collection-title">
+    <!-- Macro responsável por mostrar os dados de coleção para livro e capítulo -->
     <text variable="collection-title"/>
-    <text variable="collection-number" prefix=" "/>
+    <text variable="collection-number" prefix=", v. "/>
   </macro>
   <macro name="genre">
+    <!-- Macro responsável por mostrar as informações de tipo para carta, e-mail e mensagem -->
     <text variable="genre" suffix=". "/>
   </macro>
   <macro name="section">
+    <!-- Macro responsável por mostrar a seção quando houver -->
     <choose>
-      <if match="any" variable="section issue">
+      <if variable="section issue" match="any">
         <text variable="section"/>
         <text variable="issue"/>
       </if>
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- Macro responsável por mostrar os localizadores (página, seção, capítulo, etc.) em uma citação  -->
     <group>
       <label variable="locator" form="short"/>
       <text variable="locator" prefix=" "/>
     </group>
   </macro>
   <macro name="place">
+    <!-- Macro responsável por utilizar local de publicação como local e, em sua ausência, utilizar o termo padrão s. l.  -->
     <choose>
       <if variable="publisher-place" match="any">
         <text variable="publisher-place" suffix=", "/>
       </if>
-      <else-if type="paper-conference" variable="publisher-place">
-        <text variable="publisher-place" suffix=". "/>
-      </else-if>
       <else>
-        <text value="[s. l.]" suffix=", " font-style="italic"/>
+        <choose>
+          <if type="graphic post webpage" match="any">
+            <text value="s. l." prefix="[" suffix="], " font-style="italic" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text value="s. l." prefix="[" suffix="], " font-style="italic"/>
+          </else>
+        </choose>
       </else>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" delimiter-precedes-et-al="never">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name" collapse="year" delimiter-precedes-et-al="never">
+    <!-- CITAÇÃO: uso de sufixo para desambiguação de anos e de prenome ativos -->
     <sort>
       <key macro="author"/>
+      <!-- ordena primeiro pela macro autor -->
       <key variable="issued"/>
+      <!-- em seguida pela data -->
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
+      <!-- citações entre parênteses, separando mais de um documento com ponto-e-vírgula -->
       <choose>
         <if type="broadcast motion_picture song" match="any">
+          <!-- documentos em que citação é pelo título -->
           <group>
             <text variable="title" text-case="uppercase" suffix=", "/>
             <text macro="issued-year"/>
           </group>
         </if>
         <else>
+          <!-- do contrário é o formato padrão de autor e data separados por vírgula -->
           <group>
-            <text suffix=", " macro="author-short"/>
+            <text macro="author-short" suffix=", "/>
             <text macro="issued-year"/>
-            <text prefix=", " macro="citation-locator"/>
+            <text macro="citation-locator" prefix=", "/>
           </group>
         </else>
       </choose>
     </layout>
   </citation>
-  <bibliography et-al-min="4" et-al-use-first="1">
+  <bibliography et-al-min="4" et-al-use-first="1" line-spacing="1" entry-spacing="1">
+    <!--REFERÊNCIAS: a partir de 4 autores utiliza et al., alinhamento a esquerda, espaçamento simples e uma linha entre referências-->
     <sort>
-      <key macro="author"/>
+      <key macro="author-short"/>
+      <key macro="title"/>
+      <!-- ordena primeiro pela macro autor -->
       <key variable="issued"/>
+      <!-- em seguida pela data -->
     </sort>
     <layout>
       <choose>
-        <if type="bill">
+        <if type="article">
+          <!-- Documento (Zotero) e Programa de computador (Mendeley) -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=" "/>
+            <text variable="medium" suffix=". "/>
+            <!--incluído para ter a versão de programa de computador no mendeley-->
+            <text variable="number" prefix="Versão " suffix=". "/>
+            <text macro="publisher" suffix="  "/>
+            <text variable="genre" suffix="."/>
+            <text macro="access"/>
+          </group>
+        </if>
+        <else-if type="article-journal article-magazine" match="any">
+          <!-- Artigo de periódico e Artigo de revista  -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="place"/>
+            <text macro="edition" suffix=", "/>
+            <text macro="locators" suffix=", "/>
+            <text macro="issued"/>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper">
+          <!-- Artigo de jornal -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=". "/>
+            <text macro="container-title" suffix=", "/>
+            <text macro="place" prefix=" "/>
+            <text macro="locators"/>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="bill">
+          <!-- Audiência e Legislação -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
@@ -481,141 +684,123 @@
             <text variable="page" prefix="p. " suffix="."/>
             <text macro="access"/>
           </group>
-        </if>
-        <else-if type="map">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="publisher" suffix=". "/>
-            <text variable="genre" suffix=". "/>
-            <text variable="scale" prefix="Escala " suffix=". "/>
-            <text macro="access"/>
-          </group>
         </else-if>
         <else-if type="book">
+          <!-- Livro e, no Zotero, também Programa de computador -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="translator" suffix=". "/>
             <text variable="genre" suffix=". "/>
             <text macro="edition" suffix=". "/>
-            <text variable="version" prefix="Versão " suffix=". "/>
-            <text macro="publisher" suffix=". "/>
+            <choose>
+              <if variable="version" match="any">
+                <text term="version" text-case="capitalize-first" suffix=" "/>
+                <text variable="version" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="publisher"/>
+            <text variable="ISSN" prefix="ISSN " suffix="."/>
             <text macro="collection-title" prefix="(" suffix=")."/>
             <text macro="locators"/>
             <text variable="medium" suffix=". "/>
+            <choose>
+              <if variable="genre" match="any">
+                <!--incluido title-short para funcionar o que seria medium no Mendeley-->
+                <text variable="title-short" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="broadcast motion_picture" match="any">
+          <!-- Transmissão de rádio, Transmissão de televisão, Filme e Gravação de vídeo -->
+          <group>
+            <text macro="title"/>
+            <choose>
+              <if type="motion_picture" match="any">
+                <text macro="author" text-case="capitalize-first" suffix=". "/>
+              </if>
+              <else-if type="broadcast" match="any">
+                <text macro="author" suffix=". "/>
+              </else-if>
+            </choose>
+            <text macro="publisher"/>
+            <text variable="medium" prefix=" "/>
+            <text variable="genre" prefix=" "/>
+            <text variable="dimensions" prefix=" (" suffix="). "/>
             <text macro="access"/>
           </group>
         </else-if>
         <else-if type="chapter">
+          <!-- Capítulo -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" suffix=": " font-style="italic"/>
+            <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
             <text macro="container-contributors" suffix=". "/>
             <text macro="container-title" suffix=". "/>
             <text macro="translator" suffix=". "/>
             <text macro="edition" suffix=". "/>
-            <text macro="publisher" suffix=". "/>
+            <text macro="publisher"/>
             <text macro="collection-title" prefix="(" suffix=")."/>
             <text macro="locators" suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="article-magazine article-journal" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text variable="genre" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <choose>
-              <if match="any" variable="publisher-place">
-                <text variable="publisher-place" suffix=", "/>
-              </if>
-              <else>
-                <text value="[S. l.]" font-style="italic" suffix=", "/>
-              </else>
-            </choose>
-            <text macro="edition" suffix=", "/>
-            <text macro="locators" suffix=", "/>
-            <text macro="issued" suffix=". "/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="article-newspaper" match="any">
+        <else-if type="entry-dictionary entry-encyclopedia" match="any">
+          <!-- verbetes -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text macro="place" prefix=" "/>
-            <text macro="locators"/>
+            <text term="in" text-case="capitalize-first" font-style="italic" prefix=" " suffix=": "/>
+            <text macro="container-contributors" suffix="."/>
+            <text macro="container-title" prefix=" " suffix=". "/>
+            <text macro="publisher"/>
+            <text variable="page" prefix=" p. " suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="thesis">
+        <else-if type="graphic">
+          <!-- Obra de arte -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
-            <text macro="issued-year" suffix=". "/>
-            <text variable="genre"/>
-            <text variable="publisher" prefix=" - " suffix=", "/>
+            <text macro="title"/>
             <text macro="place"/>
-            <text macro="issued" suffix="."/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="medium" suffix=", "/>
+            <text variable="dimensions" suffix=". "/>
+            <text variable="genre" suffix="."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="webpage post">
+        <else-if type="interview">
+          <!-- Entrevista -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=" "/>
-            <text macro="place"/>
-            <text macro="issued-year" suffix=". "/>
+            <text macro="title"/>
+            <text macro="interviewer" suffix=". "/>
             <text variable="genre" suffix=". "/>
-            <text macro="access" suffix=". "/>
+            <text macro="publisher"/>
+            <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="report">
+        <else-if type="legal_case">
+          <!-- Jurisprudência -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="container-contributors"/>
-            <text macro="secondary-contributors"/>
-            <text macro="container-title"/>
-            <text variable="collection-title" prefix=": "/>
-            <text macro="locators"/>
-            <text macro="event"/>
-            <text macro="publisher" prefix=". " suffix=". "/>
-            <!--incluido genre para funcionar manuscript no Mendeley-->
-            <text variable="genre" prefix=" " suffix="."/>
-            <text macro="access" suffix="."/>
-          </group>
-        </else-if>
-        <else-if type="entry-encyclopedia entry-dictionary">
-          <group>
-            <text macro="title" suffix=". "/>
-            <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
-            <text macro="author" suffix="."/>
-            <text macro="container-title" prefix=" " suffix="."/>
-            <text variable="publisher-place" prefix=". " suffix=": "/>
-            <text variable="publisher"/>
-            <text macro="issued" prefix="," suffix=". "/>
-            <text variable="page" prefix="p. " suffix=". "/>
+            <text variable="abstract" prefix=". " suffix=". "/>
+            <text macro="container-title" prefix="Relator: " suffix=", "/>
+            <text variable="publisher-place" suffix=", "/>
+            <text macro="issued-legislation" suffix=". "/>
+            <text macro="section" prefix="Seção " suffix=", "/>
+            <text variable="page" prefix="p. " suffix="."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="paper-conference">
-          <text macro="author" suffix=". "/>
-          <text macro="title" suffix=". "/>
-          <text term="in" text-case="capitalize-first" font-style="italic" suffix=": "/>
-          <text macro="container-contributors" text-case="uppercase"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <text macro="locators"/>
-          <text macro="publisher"/>
-          <text variable="page" prefix=" p. " suffix="."/>
-          <text macro="access"/>
-        </else-if>
-        <else-if type="legislation" match="any">
+        <else-if type="legislation">
+          <!-- Estatuto -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
@@ -627,20 +812,57 @@
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="legal_case" match="any">
+        <else-if type="manuscript">
+          <!-- Manuscrito e Partitura -->
+          <group>
+            <text macro="author" suffix=". "/>
+            <text macro="title" suffix=" "/>
+            <choose>
+              <if variable="medium" match="any">
+                <group>
+                  <text variable="genre" suffix=". "/>
+                  <text macro="publisher"/>
+                  <text variable="medium" suffix="."/>
+                </group>
+              </if>
+              <else>
+                <group>
+                  <text variable="publisher-place" suffix=", "/>
+                  <text variable="publisher" suffix=", "/>
+                  <text macro="issued"/>
+                  <text variable="genre" prefix=" " suffix="."/>
+                </group>
+              </else>
+            </choose>
+            <text macro="access"/>
+          </group>
+        </else-if>
+        <else-if type="map">
+          <!-- Mapa -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text variable="abstract" prefix=". " suffix=". "/>
-            <text macro="container-title" prefix="Relator: " suffix=", "/>
-            <text variable="publisher-place" suffix=", "/>
-            <text macro="issued-legislation" suffix=". "/>
-            <text macro="section" prefix="Seção " suffix=", "/>
-            <text variable="page" prefix="p. " suffix="."/>
+            <text macro="publisher"/>
+            <text variable="genre" suffix=". "/>
+            <text variable="scale" prefix="Escala " suffix=". "/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="patent" match="any">
+        <else-if type="paper-conference">
+          <!-- trabalho em evento -->
+          <text macro="author" suffix=". "/>
+          <text macro="title" suffix=". "/>
+          <text macro="event"/>
+          <text macro="container-contributors" text-case="uppercase"/>
+          <text macro="secondary-contributors"/>
+          <text macro="container-title"/>
+          <text macro="locators"/>
+          <text macro="publisher"/>
+          <text variable="page" prefix=" p. " suffix="."/>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="patent">
+          <!-- Patente -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" prefix=" " suffix=". "/>
@@ -652,118 +874,103 @@
             <text variable="note"/>
           </group>
         </else-if>
-        <else-if type="interview" match="any">
+        <else-if type="personal_communication">
+          <!-- E-mail, Carta e Mensagem -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="interviewer" suffix=". "/>
-            <text variable="genre" suffix=". "/>
-            <text macro="publisher"/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="motion_picture broadcast song" match="any">
-          <group>
-            <text macro="title"/>
-            <choose>
-              <if type="motion_picture" match="any">
-                <text macro="author" text-case="capitalize-first" prefix=" Direção: " suffix=". "/>
-              </if>
-              <else-if type="song" match="any">
-                <text value="Intérprete" suffix=": "/>
-              </else-if>
-              <else-if type="broadcast" match="any">
-                <text value="Apresentado por "/>
-                <text macro="author" suffix=". "/>
-              </else-if>
-            </choose>
-            <text macro="composer" suffix=". "/>
-            <text macro="publisher"/>
-            <text variable="medium" prefix=" "/>
-            <text variable="genre" prefix=" "/>
-            <text variable="dimensions" prefix=" (" suffix="). "/>
-            <text macro="access"/>
-          </group>
-        </else-if>
-        <else-if type="article map" match="any">
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" text-case="capitalize-first" suffix=" "/>
-            <text variable="medium" suffix=". "/>
-            <!--incluído para ter a versão de programa de computador no mendeley-->
-            <text variable="edition" suffix=". "/>
-            <text macro="publisher" suffix="  "/>
-            <text variable="genre" suffix="."/>
-            <text variable="scale" suffix=". "/>
+            <text macro="recipient" suffix=". "/>
+            <text variable="publisher-place" suffix=", "/>
+            <text macro="issued"/>
             <text macro="access"/>
+            <text macro="genre" prefix=" "/>
           </group>
         </else-if>
-        <else-if type="speech" match="any">
+        <else-if type="post webpage">
+          <!-- Página web e Fórum -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="issued"/>
-            <text macro="access"/>
+            <text macro="title" suffix=" "/>
+            <text macro="place"/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="access" suffix=". "/>
           </group>
         </else-if>
-        <else-if type="manuscript" match="any">
+        <else-if type="post-weblog">
+          <!-- Post -->
           <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title" text-case="capitalize-first" suffix=" "/>
+            <text macro="author"/>
+            <text macro="title" prefix=". "/>
+            <text term="in" font-style="italic" text-case="capitalize-first" prefix=". " suffix=": "/>
+            <text variable="container-title" text-case="uppercase" suffix=". "/>
             <text variable="publisher-place" suffix=", "/>
             <text macro="issued"/>
-            <text variable="genre" prefix=" " suffix="."/>
             <text macro="access"/>
           </group>
         </else-if>
-        <else-if type="graphic" match="any">
+        <else-if type="report">
+          <!-- Relatório -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text macro="issued-year" suffix=". "/>
-            <text variable="medium" suffix=", "/>
-            <text variable="dimensions" suffix="."/>
-            <text variable="genre" suffix="."/>
-            <text macro="access"/>
+            <text macro="container-contributors"/>
+            <text macro="secondary-contributors"/>
+            <text macro="container-title"/>
+            <text variable="collection-title" prefix=": "/>
+            <text macro="locators"/>
+            <text macro="publisher" prefix=". "/>
+            <!--incluido genre para funcionar manuscript no Mendeley-->
+            <text variable="genre" prefix=" " suffix="."/>
+            <text macro="access" suffix="."/>
           </group>
         </else-if>
-        <else-if type="post-weblog" match="any">
+        <else-if type="song">
+          <!-- Áudio, Música e Podcast -->
+          <text macro="title"/>
+          <text macro="author" text-case="capitalize-first" suffix=". "/>
+          <text macro="composer" suffix=". "/>
+          <text macro="publisher"/>
+          <text variable="medium" prefix=" "/>
+          <text variable="genre" prefix=" "/>
+          <text variable="dimensions" prefix=" (" suffix="). "/>
+          <text macro="access"/>
+        </else-if>
+        <else-if type="speech">
+          <!-- Apresentação -->
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title"/>
-            <text term="in" font-style="italic" text-case="capitalize-first" prefix=". " suffix=": "/>
-            <text variable="container-title" text-case="capitalize-first" suffix=". "/>
-            <text variable="publisher-place" suffix=", "/>
-            <text macro="issued"/>
+            <text macro="publisher"/>
             <text macro="access"/>
           </group>
         </else-if>
-        <!--ABNT 6023:2018 - usado para e-mails, cartas-->
-        <else-if type="personal_communication" match="any">
+        <else-if type="thesis">
+          <!-- Dissertação, Tese e TCC -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text macro="recipient" suffix=". "/>
-            <text variable="publisher-place" suffix=", "/>
+            <text macro="title" suffix=". "/>
+            <text variable="number-of-pages" suffix=" f. "/>
+            <text macro="issued-year" suffix=". "/>
+            <text variable="genre"/>
+            <text variable="publisher" prefix=" - " suffix=", "/>
+            <text macro="place"/>
             <text macro="issued"/>
             <text macro="access"/>
-            <text macro="genre" prefix=" "/>
           </group>
         </else-if>
         <else>
+          <!-- Formato padrão para documentos não previstos -->
           <text macro="author" suffix=". "/>
-          <text macro="title" text-case="capitalize-first"/>
+          <text macro="title"/>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>
           <text macro="container-title"/>
           <text variable="collection-title" prefix=": " suffix="."/>
           <text macro="locators"/>
-          <group delimiter=". " prefix=". " suffix=". ">
-            <text macro="event"/>
-          </group>
           <text variable="publisher-place"/>
           <text variable="publisher" suffix=", "/>
-          <text macro="issued" prefix=", " suffix=". "/>
+          <text macro="issued" prefix=", "/>
           <text macro="access"/>
           <text variable="medium"/>
           <text variable="genre"/>
diff --git a/european-journal-of-theology.csl b/european-journal-of-theology.csl
new file mode 100644
index 00000000000..97c15164644
--- /dev/null
+++ b/european-journal-of-theology.csl
@@ -0,0 +1,433 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" and="text" page-range-format="expanded" default-locale="en-GB">
+  <info>
+    <title>European Journal of Theology</title>
+    <title-short>EJT</title-short>
+    <id>http://www.zotero.org/styles/european-journal-of-theology</id>
+    <link href="http://www.zotero.org/styles/european-journal-of-theology" rel="self"/>
+    <link href="http://www.zotero.org/styles/amsterdam-university-press-academic" rel="template"/>
+    <link href="https://www.aup.nl/nl/journal/european-journal-of-theology" rel="documentation"/>
+    <author>
+      <name>jd-s</name>
+      <uri>https://github.com/jd-s</uri>
+    </author>
+    <category citation-format="note"/>
+    <category field="theology"/>
+    <updated>2020-10-03T12: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="en">
+    <terms>
+      <term name="et-al">and others</term>
+      <term name="editor" form="verb-short">ed. by</term>
+      <term name="edition" form="short">edn</term>
+      <term name="translator" form="verb-short">trans. by</term>
+      <term name="folio">
+        <single>fol.</single>
+        <multiple>fols</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <group delimiter=". ">
+      <names variable="author">
+        <name and="text" delimiter-precedes-last="always"/>
+        <label form="short" prefix=", " suffix="."/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <text macro="title-note"/>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="recipient">
+    <group delimiter=" ">
+      <choose>
+        <if type="personal_communication">
+          <choose>
+            <if variable="genre">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+            <else>
+              <text term="letter" text-case="capitalize-first"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+      <text macro="recipient-note"/>
+    </group>
+  </macro>
+  <macro name="title-note">
+    <choose>
+      <if variable="title" match="none">
+        <text variable="genre"/>
+      </if>
+      <else-if type="bill book graphic legislation motion_picture report song" match="any">
+        <text variable="title" text-case="capitalize-first" font-style="italic"/>
+        <group delimiter=" " prefix=", ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if type="legal_case interview" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <text variable="title" font-style="italic" prefix="review of "/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="capitalize-first" quotes="true"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title-sort-substitute">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <text variable="title" form="short" text-case="capitalize-first" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title" text-case="capitalize-first" quotes="false"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor-translator">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <choose>
+          <if variable="container-author reviewed-author" match="any">
+            <group>
+              <names variable="container-author reviewed-author">
+                <label form="verb-short" text-case="lowercase" suffix=" "/>
+                <name and="text" delimiter=", "/>
+              </names>
+            </group>
+          </if>
+        </choose>
+      </group>
+      <names variable="editor translator" delimiter=", ">
+        <label form="verb-short" text-case="lowercase" suffix=" "/>
+        <name and="text" delimiter=", "/>
+      </names>
+    </group>
+  </macro>
+  <macro name="secondary-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors-note">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text macro="editor-translator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title">
+    <group delimiter=", ">
+      <choose>
+        <if type="article-journal">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </if>
+        <else>
+          <text variable="collection-title" text-case="title"/>
+          <text variable="collection-number"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="volume">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=".">
+          <text variable="volume"/>
+          <text variable="issue"/>
+        </group>
+      </if>
+      <else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <group delimiter=", ">
+          <text macro="edition-note"/>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="issue-note">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume">
+            <text macro="issued" prefix=" (" suffix=")"/>
+          </if>
+          <else>
+            <text macro="issued" prefix=", "/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="publisher-place publisher" match="any">
+        <group prefix=" (" suffix=")" delimiter=", ">
+          <group delimiter=" ">
+            <choose>
+              <if variable="title" match="none"/>
+              <else-if type="thesis speech" match="any">
+                <text variable="genre" prefix="unpublished "/>
+              </else-if>
+            </choose>
+            <text macro="event"/>
+          </group>
+          <text macro="publisher"/>
+          <text macro="issued"/>
+        </group>
+      </else-if>
+      <else>
+        <text macro="issued" prefix=", "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locators-specific-note">
+    <choose>
+      <if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="volume">
+            <number variable="volume" form="roman" font-variant="small-caps"/>
+          </if>
+          <else>
+            <text variable="volume" font-variant="small-caps"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-specific-note-short">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture paper-conference report song" match="any">
+        <choose>
+          <if is-numeric="volume">
+            <number variable="volume" form="roman" font-variant="small-caps"/>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title-note">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text term="in" suffix=" "/>
+      </if>
+    </choose>
+    <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
+  </macro>
+  <macro name="edition-note">
+    <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"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient-note">
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="recipient-short">
+    <names variable="recipient">
+      <label form="verb" font-variant="normal" prefix=" " suffix=" "/>
+      <name form="short" and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author" font-variant="normal">
+      <name form="short" font-weight="normal" and="text" initialize="false">
+        <name-part name="family" text-case="capitalize-first"/>
+      </name>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title-sort-substitute" text-case="capitalize-first"/>
+      </substitute>
+    </names>
+    <text macro="recipient-short" text-case="capitalize-first"/>
+  </macro>
+  <macro name="locators-newspaper">
+    <choose>
+      <if type="article-newspaper">
+        <group delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group>
+            <text term="section" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="thesis">
+        <text variable="publisher"/>
+      </if>
+      <else>
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issued">
+    <choose>
+      <if type="report article-newspaper article-magazine personal_communication" match="any">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="pages">
+    <choose>
+      <if type="article-journal">
+        <text variable="page" prefix=", "/>
+      </if>
+      <else>
+        <choose>
+          <if variable="volume">
+            <text variable="page" prefix=", "/>
+          </if>
+          <else>
+            <label variable="page" form="short" prefix=", " suffix=" "/>
+            <text variable="page"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="point-locators-subsequent">
+    <text prefix=": " variable="locator"/>
+  </macro>
+  <macro name="archive-note">
+    <group delimiter=", ">
+      <text variable="archive-place"/>
+      <text variable="archive"/>
+      <text variable="archive_location"/>
+    </group>
+  </macro>
+  <macro name="access-note">
+    <group delimiter=", ">
+      <choose>
+        <if type="article-journal bill chapter legal_case legislation paper-conference" match="none">
+          <text macro="archive-note" prefix=", "/>
+        </if>
+      </choose>
+    </group>
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix=" &lt;https://doi.org/" suffix="&gt;"/>
+      </if>
+      <else>
+        <choose>
+          <if variable="URL">
+            <text variable="URL" prefix=" &lt;" suffix="&gt;"/>
+            <group prefix=" [" suffix="]">
+              <text term="accessed"/>
+              <date variable="accessed">
+                <date-part name="day" prefix=" "/>
+                <date-part name="month" prefix=" "/>
+                <date-part name="year" prefix=" "/>
+              </date>
+            </group>
+          </if>
+        </choose>
+      </else>
+    </choose>
+  </macro>
+  <macro name="artwork">
+    <choose>
+      <if type="graphic" match="any">
+        <group delimiter=", " prefix=", ">
+          <text variable="medium"/>
+          <text variable="dimensions"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <citation name-form="short" et-al-min="4" et-al-use-first="1" initialize="false" disambiguate-add-names="true" disambiguate-add-givenname="true">
+    <layout suffix="." delimiter="; ">
+      <choose>
+        <if position="subsequent">
+          <group delimiter=", ">
+            <text macro="contributors-short" text-case="capitalize-first"/>
+            <text macro="issued"/>
+            <text macro="locators-specific-note-short"/>
+          </group>
+          <text macro="point-locators-subsequent"/>
+        </if>
+        <else>
+          <group delimiter=", ">
+            <text macro="contributors-short" text-case="capitalize-first"/>
+            <text macro="issued"/>
+            <text macro="locators-specific-note-short"/>
+          </group>
+          <text macro="point-locators-subsequent"/>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6">
+    <sort>
+      <key variable="archive"/>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=", ">
+        <text macro="author"/>
+        <text macro="title-note"/>
+        <text macro="secondary-contributors-note"/>
+        <text macro="container-title-note"/>
+        <text macro="container-contributors-note"/>
+        <text macro="collection-title"/>
+        <text macro="volume"/>
+      </group>
+      <text macro="issue-note"/>
+      <text macro="locators-specific-note" prefix=", "/>
+      <text macro="artwork" prefix=", "/>
+      <text macro="locators-newspaper" prefix=", "/>
+      <text macro="pages"/>
+      <text macro="access-note"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/german-yearbook-of-international-law.csl b/german-yearbook-of-international-law.csl
new file mode 100644
index 00000000000..59f0a7f6e7e
--- /dev/null
+++ b/german-yearbook-of-international-law.csl
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" et-al-min="4" et-al-use-first="1" initialize="false" initialize-with="." demote-non-dropping-particle="sort-only" default-locale="en-GB">
+  <!-- This style was edited with the Visual CSL Editor (https://editor.citationstyles.org/visualEditor/) -->
+  <info>
+    <title>German Yearbook of International Law</title>
+    <title-short>GYIL</title-short>
+    <id>http://www.zotero.org/styles/german-yearbook-of-international-law</id>
+    <link href="http://www.zotero.org/styles/german-yearbook-of-international-law" rel="self"/>
+    <link href="http://www.zotero.org/styles/european-journal-of-international-law" rel="template"/>
+    <link href="https://www.wsi.uni-kiel.de/de/forschung/gyil/gyil-style-sheet-2018" rel="documentation"/>
+    <author>
+      <name>Michel Rouleau-Dick</name>
+      <email>mrouleau@abo.fi</email>
+    </author>
+    <category citation-format="note"/>
+    <category field="law"/>
+    <issn>0344-3094</issn>
+    <updated>2020-07-09T07:59:35+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="accessed">last visited</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name prefix=" " and="text" delimiter-precedes-last="never" initialize="false" initialize-with=". "/>
+      <label form="short" prefix=" (" suffix="), "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name form="short" and="text" delimiter-precedes-last="never" initialize="false" initialize-with="" sort-separator=""/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-bibliography">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+      <label form="short" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-long">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with=". "/>
+      <substitute>
+        <names variable="editor">
+          <name and="text" delimiter-precedes-last="never" initialize="false" initialize-with=". " sort-separator=" "/>
+          <label form="short" prefix=" (" suffix=")"/>
+        </names>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="edition">
+    <group delimiter=", " prefix=" (" suffix=")">
+      <choose>
+        <if match="all" variable="edition" is-numeric="edition">
+          <number suffix=" ed." variable="edition" form="ordinal"/>
+        </if>
+        <else-if match="any" variable="edition">
+          <number variable="edition"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if match="any" variable="edition">
+          <date date-parts="year" form="text" variable="issued"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="thesis">
+    <choose>
+      <if type="thesis" match="any">
+        <group prefix="(" suffix=")" delimiter=" ">
+          <text variable="genre" suffix=" thesis,  "/>
+          <choose>
+            <if variable="URL" match="none">
+              <group>
+                <text term="available at"/>
+                <text variable="publisher" prefix=" "/>
+                <text variable="publisher-place" prefix=", "/>
+              </group>
+            </if>
+            <else>
+              <group>
+                <text variable="publisher" prefix=" "/>
+                <text variable="publisher-place" prefix=", "/>
+                <text term="available at" prefix="/" suffix=" "/>
+                <text variable="publisher"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="volume">
+    <number prefix=", " suffix=" " variable="number-of-volumes"/>
+    <text term="volume" form="short" plural="true"/>
+  </macro>
+  <macro name="URL">
+    <choose>
+      <if match="any" variable="URL">
+        <text term="available at" prefix=", " suffix=" "/>
+        <text variable="URL"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="web">
+    <group>
+      <text variable="title" text-case="title" font-style="italic" vertical-align="baseline"/>
+      <date form="text" variable="issued" vertical-align="baseline" prefix=", "/>
+      <text variable="container-title" text-case="title" prefix=", "/>
+      <text macro="URL"/>
+    </group>
+  </macro>
+  <macro name="locator">
+    <choose>
+      <if match="any" variable="locator">
+        <text term="at" prefix=", " suffix=" "/>
+        <text variable="locator"/>
+      </if>
+    </choose>
+  </macro>
+  <citation collapse="year">
+    <layout suffix=".">
+      <choose>
+        <if position="first">
+          <choose>
+            <if type="book legal_case motion_picture report" match="any">
+              <group>
+                <text macro="author-long" suffix=", "/>
+                <text variable="authority" prefix=" " suffix=", "/>
+                <text variable="title" text-case="title" font-style="italic"/>
+                <text variable="genre" prefix=", "/>
+                <number prefix=", " variable="number"/>
+                <text macro="volume"/>
+                <choose>
+                  <if match="none" variable="edition" type="legal_case">
+                    <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=")"/>
+                  </if>
+                  <else-if type="legal_case" match="any">
+                    <text variable="volume" prefix=", "/>
+                    <date form="text" variable="issued" prefix=", "/>
+                  </else-if>
+                </choose>
+                <text variable="container-title" text-case="title" prefix=", "/>
+                <text variable="page-first" prefix=", "/>
+                <text macro="edition"/>
+                <text macro="URL"/>
+                <text macro="locator"/>
+              </group>
+            </if>
+            <else-if type="chapter paper-conference" match="any">
+              <group delimiter=" ">
+                <text macro="author-long" suffix=","/>
+                <text variable="title" text-case="title" prefix="'" suffix="',"/>
+                <group delimiter=" ">
+                  <text term="in"/>
+                  <text macro="editor"/>
+                  <text variable="container-title" text-case="title" font-style="italic"/>
+                </group>
+                <group delimiter=" ">
+                  <text term="volume" form="short"/>
+                  <text variable="volume"/>
+                </group>
+                <text variable="edition"/>
+                <group>
+                  <date variable="issued">
+                    <date-part name="year" prefix="(" suffix=")"/>
+                  </date>
+                  <text variable="page-first" prefix=" "/>
+                </group>
+                <text macro="locator"/>
+              </group>
+            </else-if>
+            <else-if type="article-journal article-magazine article-newspaper interview personal_communication speech" match="any">
+              <group delimiter=" ">
+                <text macro="author-long" suffix=", "/>
+                <text variable="title" text-case="title" prefix="'" suffix="', "/>
+                <text variable="volume"/>
+                <text variable="container-title" text-case="title" font-style="italic"/>
+                <date variable="issued" prefix="(" suffix=")">
+                  <date-part name="year"/>
+                </date>
+                <text variable="page-first"/>
+                <text variable="edition"/>
+                <text macro="URL"/>
+                <text macro="locator"/>
+              </group>
+            </else-if>
+            <else-if type="webpage post-weblog" match="any">
+              <group vertical-align="baseline" delimiter=", ">
+                <text macro="author-long"/>
+                <text macro="web"/>
+              </group>
+            </else-if>
+            <else-if type="thesis" match="any">
+              <text macro="author-long" suffix=", "/>
+              <text variable="title" text-case="title" prefix="'" suffix="' "/>
+              <date date-parts="year" form="text" variable="issued" prefix="(" suffix=") "/>
+              <text macro="thesis"/>
+              <text macro="locator"/>
+            </else-if>
+            <else-if type="bill" match="any">
+              <group>
+                <text variable="title"/>
+                <date form="text" variable="issued" prefix=", "/>
+                <text variable="volume" prefix=", "/>
+              </group>
+            </else-if>
+            <else>
+              <group delimiter=", ">
+                <text macro="author-long"/>
+                <text variable="title" text-case="title"/>
+                <number variable="number"/>
+                <group delimiter=", ">
+                  <text variable="container-title" text-case="title" font-style="normal" prefix=" "/>
+                  <date date-parts="year" form="text" variable="issued"/>
+                  <group delimiter=" ">
+                    <text variable="volume"/>
+                  </group>
+                  <text variable="issue"/>
+                </group>
+                <group>
+                  <label variable="locator" form="short"/>
+                  <text variable="locator" prefix=" "/>
+                </group>
+              </group>
+            </else>
+          </choose>
+        </if>
+        <else-if position="ibid-with-locator">
+          <group delimiter=", ">
+            <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+            <group>
+              <text term="at"/>
+              <text variable="locator" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if position="ibid">
+          <text term="ibid" form="long" font-style="italic" text-case="capitalize-first"/>
+        </else-if>
+        <else-if position="subsequent">
+          <text macro="author"/>
+          <text value="supra" font-style="italic" prefix=", " suffix=" "/>
+          <text value="note" suffix=" "/>
+          <text variable="first-reference-note-number" font-style="normal"/>
+          <choose>
+            <if match="any" variable="locator">
+              <text term="at" prefix=", " suffix=" "/>
+              <text variable="locator"/>
+            </if>
+          </choose>
+          <text value=""/>
+        </else-if>
+      </choose>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true">
+    <sort>
+      <key macro="author-bibliography"/>
+      <key variable="title"/>
+    </sort>
+    <layout suffix=".">
+      <choose>
+        <if type="book legal_case report motion_picture" match="any">
+          <group>
+            <text variable="authority" suffix=", "/>
+            <text macro="author-bibliography" suffix=", "/>
+            <text variable="title" text-case="title" font-style="italic"/>
+            <text variable="genre" prefix=", "/>
+            <number prefix=", " suffix=" " variable="number"/>
+            <text macro="volume"/>
+            <choose>
+              <if match="none" variable="edition" type="legal_case">
+                <date date-parts="year" form="text" variable="issued" prefix=" (" suffix=")"/>
+              </if>
+              <else-if type="legal_case" match="any">
+                <date form="text" variable="issued" prefix=", "/>
+              </else-if>
+            </choose>
+            <text variable="container-title" text-case="title" prefix=", "/>
+            <text variable="page-first" prefix=" "/>
+            <text macro="edition"/>
+            <text macro="URL"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=" ">
+            <names variable="author">
+              <name form="short" suffix=", "/>
+            </names>
+            <text variable="title" text-case="title" prefix="'" suffix="',"/>
+            <group delimiter=" ">
+              <text term="in"/>
+              <text macro="editor"/>
+              <text variable="container-title" text-case="title" font-style="italic"/>
+            </group>
+            <group delimiter=" ">
+              <text term="volume" form="short"/>
+              <text variable="volume"/>
+            </group>
+            <text variable="edition"/>
+            <group>
+              <date variable="issued">
+                <date-part name="year" prefix="(" suffix=")"/>
+              </date>
+              <text variable="page-first" prefix=" "/>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="article-journal article-magazine article-newspaper interview manuscript map personal_communication speech" match="any">
+          <group delimiter=" ">
+            <names variable="author" suffix=", ">
+              <name form="short" and="text"/>
+            </names>
+            <text variable="title" text-case="title" prefix="'" suffix="', "/>
+            <text variable="volume"/>
+            <text variable="container-title" text-case="title" font-style="italic"/>
+            <group delimiter=" ">
+              <date variable="issued" prefix="(" suffix=")">
+                <date-part name="year"/>
+              </date>
+            </group>
+            <text variable="page-first"/>
+            <text variable="edition"/>
+            <text macro="URL"/>
+          </group>
+        </else-if>
+        <else-if type="webpage post-weblog" match="any">
+          <group delimiter=", ">
+            <text macro="author-bibliography"/>
+            <text macro="web"/>
+          </group>
+        </else-if>
+        <else-if type="thesis" match="any">
+          <text macro="author-bibliography" suffix=", "/>
+          <text variable="title" text-case="title" prefix="'" suffix="' "/>
+          <date date-parts="year" form="text" variable="issued" prefix="(" suffix=") "/>
+          <text macro="thesis"/>
+          <text macro="locator"/>
+        </else-if>
+        <else>
+          <group delimiter=", ">
+            <text macro="author-bibliography"/>
+            <text variable="title" text-case="title" font-style="normal"/>
+            <number variable="number"/>
+            <group delimiter=", ">
+              <text variable="container-title" text-case="title" font-style="normal"/>
+              <group delimiter=" ">
+                <text term="volume" form="short"/>
+                <text variable="volume"/>
+              </group>
+              <text variable="issue"/>
+              <date form="text" date-parts="year-month-day" variable="issued"/>
+            </group>
+            <group>
+              <label variable="locator" form="short"/>
+              <text variable="locator" prefix=" "/>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </bibliography>
+</style>
diff --git a/harvard-cite-them-right.csl b/harvard-cite-them-right.csl
index 24e9f0530e6..d7fb56c4041 100644
--- a/harvard-cite-them-right.csl
+++ b/harvard-cite-them-right.csl
@@ -164,7 +164,7 @@
           </group>
         </group>
       </else-if>
-    <else-if type="article-journal article-newspaper article-magazine" match="none">
+      <else-if type="article-journal article-newspaper article-magazine" match="none">
         <group delimiter=" ">
           <group delimiter=", ">
             <choose>
diff --git a/harvard-university-of-westminster.csl b/harvard-university-of-westminster.csl
index b930c9cc27c..7aa8057ad69 100644
--- a/harvard-university-of-westminster.csl
+++ b/harvard-university-of-westminster.csl
@@ -17,7 +17,7 @@
     <category citation-format="author-date"/>
     <category field="generic-base"/>
     <summary>Harvard - University of Westminster</summary>
-    <updated>2020-03-11T11:07:38+00:00</updated>
+    <updated>2020-09-26T16:50: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>
   <locale xml:lang="en-GB">
@@ -27,8 +27,8 @@
   </locale>
   <macro name="editor">
     <names variable="editor" delimiter=" ">
-      <name delimiter=" " suffix="," and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
-      <label form="short" prefix=" "/>
+      <name delimiter=" " and="text" delimiter-precedes-last="never" initialize-with="." name-as-sort-order="all"/>
+      <label form="short" prefix=" (" suffix=")"/>
     </names>
   </macro>
   <macro name="author">
@@ -97,6 +97,12 @@
         <text variable="title"/>
         <text value="image" prefix=" [" suffix="]"/>
       </else-if>
+      <else-if type="thesis" match="any">
+        <group delimiter=" ">
+          <text variable="title"/>
+          <text variable="genre" prefix="[" suffix="]"/>
+        </group>
+      </else-if>
       <else>
         <text variable="title"/>
       </else>
@@ -203,7 +209,7 @@
               </group>
             </group>
           </if>
-          <else-if type="report book" match="any">
+          <else-if type="report book thesis" match="any">
             <group delimiter=". ">
               <text macro="publisher"/>
             </group>
@@ -256,6 +262,21 @@
           <else-if type="webpage post post-weblog" match="any">
             <text variable="container-title" font-style="italic"/>
           </else-if>
+          <else-if type="manuscript" match="any">
+            <group delimiter=": ">
+              <group delimiter=". ">
+                <group delimiter=", ">
+                  <text variable="archive_location"/>
+                  <group delimiter=" ">
+                    <label text-case="capitalize-first" variable="number" form="short"/>
+                    <text variable="call-number"/>
+                  </group>
+                </group>
+                <text variable="archive-place"/>
+              </group>
+              <text variable="archive"/>
+            </group>
+          </else-if>
           <else>
             <group delimiter=", ">
               <text variable="container-title" font-style="italic"/>
diff --git a/institut-national-de-recherches-archeologiques-preventives.csl b/institut-national-de-recherches-archeologiques-preventives.csl
index 5e7dbc7fd8e..adddbc5992c 100644
--- a/institut-national-de-recherches-archeologiques-preventives.csl
+++ b/institut-national-de-recherches-archeologiques-preventives.csl
@@ -238,7 +238,7 @@
       <key variable="issued"/>
     </sort>
     <layout suffix=".">
-      <group font-weight="bold" delimiter=" " suffix="&#xD;">
+      <group font-weight="bold" delimiter=" " suffix="&#13;">
         <text macro="author-short"/>
         <text macro="year-date"/>
       </group>
diff --git a/iso690-full-note-cs.csl b/iso690-full-note-cs.csl
index 957801deeb6..f51ab01532f 100644
--- a/iso690-full-note-cs.csl
+++ b/iso690-full-note-cs.csl
@@ -14,7 +14,7 @@
     <category citation-format="note"/>
     <category field="law"/>
     <summary>Czech ISO-690, full note.</summary>
-    <updated>2020-09-18T10:00:11+00:00</updated>
+    <updated>2020-10-07T01:38:13+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">
@@ -299,10 +299,10 @@
       <if variable="DOI">
         <text variable="DOI" prefix="DOI:&#160;"/>
       </if>
-      <else>
+      <else-if variable="URL">
         <text term="available at" text-case="capitalize-first" suffix=":&#160;"/>
         <text variable="URL"/>
-      </else>
+      </else-if>
     </choose>
   </macro>
   <macro name="medium">
@@ -366,7 +366,6 @@
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else-if variable="issued" match="none">
                   <choose>
@@ -381,6 +380,7 @@
                   <text macro="locator-or-period"/>
                 </else>
               </choose>
+              <text prefix=". " macro="identifier"/>
             </if>
             <else-if type="article-magazine article-newspaper webpage" match="any">
               <text macro="contributors-long" suffix=". "/>
@@ -391,13 +391,13 @@
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else>
                   <text prefix=". " macro="issued"/>
                   <text macro="locator-or-period"/>
                 </else>
               </choose>
+              <text prefix=". " macro="identifier"/>
             </else-if>
             <else-if type="article-journal" match="any">
               <text macro="contributors-long" suffix=". "/>
@@ -416,12 +416,12 @@
                 <if variable="URL" match="any">
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else>
                   <text macro="locator-or-period"/>
                 </else>
               </choose>
+              <text prefix=". " macro="identifier"/>
             </else-if>
             <else-if type="thesis" match="any">
               <text macro="contributors-long" suffix=". "/>
@@ -440,7 +440,6 @@
                   <text prefix=". " macro="issued"/>
                   <text prefix=", " macro="citation-locator"/>
                   <text prefix=" " macro="quoted"/>
-                  <text prefix=". " macro="identifier"/>
                 </if>
                 <else-if variable="issued" match="none">
                   <text prefix=" " macro="medium"/>
@@ -471,6 +470,7 @@
                   </choose>
                 </else>
               </choose>
+              <text prefix=". " macro="identifier"/>
             </else>
           </choose>
         </else>
@@ -497,7 +497,6 @@
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
-              <text prefix=". " macro="identifier"/>
             </if>
             <else-if variable="issued" match="none">
               <text prefix=". " macro="edition" suffix="."/>
@@ -519,6 +518,7 @@
               <text prefix=". " macro="ISBN" suffix="."/>
             </else>
           </choose>
+          <text prefix=". " macro="identifier"/>
         </if>
         <else-if type="article-magazine article-newspaper webpage" match="any">
           <text macro="contributors-full" suffix=". "/>
@@ -530,13 +530,13 @@
               <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="ISSN" suffix="."/>
-              <text prefix=". " macro="identifier"/>
             </if>
             <else>
               <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="ISSN" suffix="."/>
             </else>
           </choose>
+          <text prefix=". " macro="identifier"/>
         </else-if>
         <else-if type="article-journal" match="any">
           <text macro="contributors-full" suffix=". "/>
@@ -556,13 +556,13 @@
               <text prefix=", " macro="page-range"/>
               <text prefix=" " macro="quoted"/>
               <text prefix=". " macro="ISSN" suffix="."/>
-              <text prefix=". " macro="identifier"/>
             </if>
             <else>
               <text prefix=", " macro="page-range" suffix="."/>
               <text prefix=". " macro="ISSN" suffix="."/>
             </else>
           </choose>
+          <text prefix=". " macro="identifier"/>
         </else-if>
         <else-if type="thesis" match="any">
           <text macro="contributors-full" suffix=". "/>
@@ -583,7 +583,6 @@
               <text prefix=" " macro="quoted" suffix="."/>
               <text prefix=". " macro="collection" suffix="."/>
               <text prefix=". " macro="ISBN" suffix="."/>
-              <text prefix=". " macro="identifier"/>
             </if>
             <else-if variable="issued" match="none">
               <text prefix=" " macro="medium" suffix="."/>
@@ -603,6 +602,7 @@
               <text prefix=". " macro="ISBN" suffix="."/>
             </else>
           </choose>
+          <text prefix=". " macro="identifier"/>
         </else-if>
       </choose>
     </layout>
diff --git a/royal-college-of-nursing-harvard.csl b/royal-college-of-nursing-harvard.csl
index 53a5028e1f8..53d492ccebe 100644
--- a/royal-college-of-nursing-harvard.csl
+++ b/royal-college-of-nursing-harvard.csl
@@ -12,7 +12,7 @@
     <category citation-format="author-date"/>
     <category field="medicine"/>
     <summary>Harvard house style for the Royal College of Nursing</summary>
-    <updated>2017-05-17T00:00:00+00:00</updated>
+    <updated>2019-11-15T03:49: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-GB">
@@ -66,6 +66,9 @@
           <if type="article-newspaper article-magazine" match="any">
             <text variable="container-title" text-case="title" font-style="italic"/>
           </if>
+          <else-if type="webpage" match="any">
+            <text variable="container-title"/>
+          </else-if>
           <else>
             <text macro="title"/>
           </else>
@@ -101,9 +104,9 @@
           </if>
         </choose>
       </if>
-      <else>
+      <else-if type="book chapter" match="none">
         <text macro="DOI-URL"/>
-      </else>
+      </else-if>
     </choose>
   </macro>
   <macro name="DOI-URL">
@@ -150,7 +153,7 @@
           <text macro="edition"/>
         </group>
       </if>
-      <else-if type="article-journal" match="any">
+      <else-if type="article-journal article-newspaper post-weblog" match="any">
         <text variable="title"/>
       </else-if>
       <else>
@@ -178,7 +181,7 @@
           </group>
         </group>
       </else-if>
-      <else-if type="article-newspaper article-magazine" match="none">
+      <else-if type="article-journal article-newspaper article-magazine legislation" match="none">
         <group delimiter=" ">
           <group delimiter=", ">
             <choose>
@@ -191,10 +194,6 @@
               <text variable="publisher"/>
             </group>
           </group>
-          <group prefix="(" suffix=")" delimiter=", ">
-            <text variable="collection-title"/>
-            <text variable="collection-number"/>
-          </group>
         </group>
       </else-if>
     </choose>
diff --git a/society-of-biblical-literature-author-date.csl b/society-of-biblical-literature-author-date.csl
index 14a5d8efcf2..6b7b27a7d79 100644
--- a/society-of-biblical-literature-author-date.csl
+++ b/society-of-biblical-literature-author-date.csl
@@ -20,6 +20,10 @@
   <locale xml:lang="en">
     <terms>
       <term name="editor" form="verb-short">ed.</term>
+      <term name="section" form="short">
+        <single>§</single>
+        <multiple>§§</multiple>
+      </term>
       <term name="translator" form="verb-short">trans.</term>
       <term name="translator" form="short">trans.</term>
       <term name="editortranslator" form="verb-short">ed. and trans.</term>
diff --git a/society-of-biblical-literature-fullnote-bibliography.csl b/society-of-biblical-literature-fullnote-bibliography.csl
index 339f85a8bbf..821bff3dc2e 100644
--- a/society-of-biblical-literature-fullnote-bibliography.csl
+++ b/society-of-biblical-literature-fullnote-bibliography.csl
@@ -33,6 +33,10 @@
   <locale xml:lang="en-US">
     <terms>
       <term name="editor" form="verb-short">ed.</term>
+      <term name="section" form="short">
+        <single>§</single>
+        <multiple>§§</multiple>
+      </term>
       <term name="translator" form="verb-short">trans.</term>
       <term name="translator" form="short">trans.</term>
       <term name="editortranslator" form="verb-short">ed. and trans.</term>
@@ -498,7 +502,7 @@
                     <text value=" of"/>
                   </group>
                 </if>
-                <else-if type="chapter" variable="container-title" match="all">
+                <else-if type="chapter" variable="collection-title" match="all">
                   <!--SBL 6.2.23-->
                   <group>
                     <text term="volume" form="short" suffix=" "/>
@@ -549,7 +553,7 @@
                     <text value=" of"/>
                   </group>
                 </if>
-                <else-if type="chapter" variable="container-title" match="all">
+                <else-if type="chapter" variable="collection-title" match="all">
                   <!--SBL 6.2.23-->
                   <group>
                     <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
diff --git a/ucl-university-college-vancouver.csl b/ucl-university-college-vancouver.csl
index 35bfedfb58e..d7fbe40ddfc 100644
--- a/ucl-university-college-vancouver.csl
+++ b/ucl-university-college-vancouver.csl
@@ -9,7 +9,7 @@
       <name>Roald Erik Frøsig</name>
       <email>roaldfrosig@gmail.com</email>
     </author>
-     <contributor>
+    <contributor>
       <name>Camilla K. Andresen</name>
       <email>ckan1@ucl.dk</email>
     </contributor>
diff --git a/universite-de-lausanne-histoire.csl b/universite-de-lausanne-histoire.csl
index 341588c08a8..9a3fa5c0759 100644
--- a/universite-de-lausanne-histoire.csl
+++ b/universite-de-lausanne-histoire.csl
@@ -5,7 +5,7 @@
     <id>http://www.zotero.org/styles/universite-de-lausanne-histoire</id>
     <link href="http://www.zotero.org/styles/universite-de-lausanne-histoire" rel="self"/>
     <link href="http://www.zotero.org/styles/infoclio-fr-smallcaps" rel="template"/>
-    <link href="https://github.com/LausanneCitationStyle/Lausanne" rel="documentation"/>
+    <link href="https://lausannecitationstyle.github.io/support/" rel="documentation"/>
     <author>
       <name>Nicolas Chachereau</name>
       <email>nicolas.chachereau@unil.ch</email>
@@ -35,6 +35,7 @@
       <term name="number-of-volumes" form="short">vol.</term>
       <term name="et-al">et alii</term>
       <term name="issue" form="short">nᵒ</term>
+      <term name="no date" form="short">s.d.</term>
     </terms>
   </locale>
   <citation>
@@ -113,7 +114,7 @@
   </macro>
   <macro name="creator">
     <names variable="author">
-      <name sort-separator=", " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
+      <name sort-separator=" " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
         <name-part name="family" font-variant="small-caps"/>
       </name>
       <et-al font-style="italic"/>
@@ -238,7 +239,7 @@
   </macro>
   <macro name="scientific-editor-name">
     <names variable="editor">
-      <name sort-separator=", " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
+      <name sort-separator=" " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
         <name-part name="family" font-variant="small-caps"/>
       </name>
       <et-al font-style="italic"/>
@@ -248,7 +249,7 @@
   </macro>
   <macro name="translator">
     <names variable="translator">
-      <name sort-separator=", " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
+      <name sort-separator=" " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
         <name-part name="family" font-variant="small-caps"/>
       </name>
       <et-al font-style="italic"/>
@@ -266,7 +267,7 @@
     <choose>
       <if type="chapter paper-conference" match="any">
         <names variable="container-author">
-          <name sort-separator=", " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
+          <name sort-separator=" " name-as-sort-order="all" et-al-min="3" et-al-use-first="1">
             <name-part name="family" font-variant="small-caps"/>
           </name>
           <et-al font-style="italic"/>
@@ -425,7 +426,7 @@
             <date variable="issued" form="numeric" date-parts="year"/>
           </if>
           <else>
-            <text term="no date" form="short"/>
+            <text term="no date" form="short" prefix=" [" suffix="]"/>
           </else>
         </choose>
       </if>
@@ -435,7 +436,7 @@
             <date variable="issued" form="numeric" date-parts="year-month-day"/>
           </if>
           <else>
-            <text term="no date" form="short"/>
+            <text term="no date" form="short" prefix=" [" suffix="]"/>
           </else>
         </choose>
       </else-if>
diff --git a/wirtschaftsuniversitat-wien-interdisziplinares-institut-fur-verhaltenswissenschaftlich-orientiertes-management.csl b/wirtschaftsuniversitat-wien-interdisziplinares-institut-fur-verhaltenswissenschaftlich-orientiertes-management.csl
deleted file mode 100644
index 72321b3c6c6..00000000000
--- a/wirtschaftsuniversitat-wien-interdisziplinares-institut-fur-verhaltenswissenschaftlich-orientiertes-management.csl
+++ /dev/null
@@ -1,555 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" initialize-with="." demote-non-dropping-particle="never">
-  <info>
-    <title>Wirtschaftsuniversität Wien - Interdisziplinäres Institut für Verhaltenswissenschaftlich Orientiertes Management</title>
-    <title-short>WU Wien ivm</title-short>
-    <id>http://www.zotero.org/styles/wirtschaftsuniversitat-wien-interdisziplinares-institut-fur-verhaltenswissenschaftlich-orientiertes-management</id>
-    <link href="http://www.zotero.org/styles/wirtschaftsuniversitat-wien-interdisziplinares-institut-fur-verhaltenswissenschaftlich-orientiertes-management" rel="self"/>
-    <link href="http://www.zotero.org/styles/apa" rel="template"/>
-    <link href="https://www.wu.ac.at/fileadmin/wu/d/i/ivm/IVM_LEHRE/Bachelorarbeit_IVM_Formleitfaden.pdf" rel="documentation"/>
-    <author>
-      <name>Georg Mayr-Duffner</name>
-      <email>georg.mayr-duffner@wu.ac.at</email>
-      <uri>http://wu.ac.at/library</uri>
-    </author>
-    <category citation-format="author-date"/>
-    <category field="social_science"/>
-    <summary>Citation style for thesis at WU Vienna ivm, Interdisciplinary Institute for Management and Organisational Behaviour</summary>
-    <updated>2018-03-21T11:03:15+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="anonymous">No author</term>
-      <term name="presented at">Paper presented at the</term>
-    </terms>
-  </locale>
-  <locale xml:lang="de">
-    <terms>
-      <term name="accessed">abgefragt am</term>
-      <term name="et-al">et al.</term>
-      <term name="presented at">Paper präsentiert bei der</term>
-      <term name="anonymous">Anonym</term>
-    </terms>
-  </locale>
-  <macro name="container-contributors">
-    <choose>
-      <if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group>
-          <names variable="container-author" delimiter="; ">
-            <name and="symbol" initialize-with=". "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-          <names variable="editor translator" delimiter=", ">
-            <name and="symbol" initialize-with=". "/>
-            <label form="short" prefix=" (" text-case="title" suffix=")"/>
-          </names>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="secondary-contributors">
-    <choose>
-      <if type="article-journal chapter paper-conference entry-dictionary entry-encyclopedia" match="none">
-        <group delimiter=", " prefix=" (" suffix=")">
-          <names variable="container-author" delimiter=", ">
-            <name delimiter-precedes-last="always" initialize="false" initialize-with=". " name-as-sort-order="all"/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-          <names variable="editor translator" delimiter="; ">
-            <name delimiter-precedes-last="always" initialize="false" initialize-with=". " name-as-sort-order="all"/>
-            <label form="short" prefix=", " text-case="title"/>
-          </names>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name delimiter-precedes-last="always" initialize="false" initialize-with=". " name-as-sort-order="all" delimiter="; "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <group>
-          <text term="anonymous"/>
-        </group>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="symbol" delimiter-precedes-et-al="never" delimiter-precedes-last="never" initialize-with=". "/>
-      <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
-        <choose>
-          <if type="report">
-            <text variable="publisher"/>
-            <text variable="title" form="short" font-style="italic"/>
-          </if>
-          <else-if type="legal_case">
-            <text variable="title" font-style="italic"/>
-          </else-if>
-          <else-if type="bill book graphic legislation motion_picture song" match="any">
-            <text variable="title" form="short" font-style="italic"/>
-          </else-if>
-          <else-if variable="reviewed-author">
-            <choose>
-              <if variable="reviewed-title" match="none">
-                <text variable="title" form="short" font-style="italic" prefix="Review of "/>
-              </if>
-              <else>
-                <text variable="title" form="short" quotes="true"/>
-              </else>
-            </choose>
-          </else-if>
-          <else>
-            <group>
-              <text term="anonymous"/>
-            </group>
-          </else>
-        </choose>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <group delimiter=", ">
-      <choose>
-        <if variable="DOI">
-          <text variable="DOI" prefix="DOI: "/>
-        </if>
-        <else>
-          <text variable="URL"/>
-        </else>
-      </choose>
-      <group delimiter=" ">
-        <text term="accessed"/>
-        <date delimiter="." variable="accessed">
-          <date-part name="day" form="numeric-leading-zeros"/>
-          <date-part name="month" form="numeric-leading-zeros"/>
-          <date-part name="year"/>
-        </date>
-      </group>
-    </group>
-  </macro>
-  <macro name="title">
-    <choose>
-      <if type="book graphic manuscript motion_picture report song speech thesis webpage post-weblog paper-conference" match="any">
-        <text variable="title"/>
-      </if>
-      <else-if variable="reviewed-author">
-        <choose>
-          <if variable="reviewed-title">
-            <group delimiter=" ">
-              <text variable="title"/>
-              <group delimiter=", " prefix="[" suffix="]">
-                <text variable="reviewed-title" font-style="normal" prefix="Review of "/>
-                <names variable="reviewed-author" delimiter=", ">
-                  <label form="verb-short" suffix=" "/>
-                  <name and="symbol" initialize-with=". " delimiter=", "/>
-                </names>
-              </group>
-            </group>
-          </if>
-          <else>
-            <group delimiter=", " prefix="[" suffix="]">
-              <text variable="title" font-style="normal" prefix="Review of "/>
-              <names variable="reviewed-author" delimiter=", ">
-                <label form="verb-short" suffix=" "/>
-                <name initialize-with=". "/>
-              </names>
-            </group>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <text variable="title"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="title-plus-extra">
-    <text macro="title"/>
-    <choose>
-      <if type="report" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <group delimiter=" ">
-            <text variable="genre"/>
-            <group delimiter=" ">
-              <text term="issue" form="short"/>
-              <text variable="number"/>
-            </group>
-          </group>
-          <group delimiter=" ">
-            <text term="version" text-case="capitalize-first"/>
-            <text variable="version"/>
-          </group>
-        </group>
-      </if>
-      <else-if type="post-weblog webpage" match="any">
-        <text variable="genre" prefix=" [" suffix="]"/>
-      </else-if>
-      <else-if variable="version">
-        <group delimiter=" " prefix=" (" suffix=")">
-          <text term="version" text-case="capitalize-first"/>
-          <text variable="version"/>
-        </group>
-      </else-if>
-    </choose>
-    <text macro="format" prefix=" [" suffix="]"/>
-  </macro>
-  <macro name="format">
-    <choose>
-      <if match="any" variable="medium">
-        <text variable="medium" text-case="capitalize-first"/>
-      </if>
-      <else-if type="dataset" match="any">
-        <text value="Data set"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="publisher">
-    <choose>
-      <if type="report" match="any">
-        <group delimiter=": ">
-          <text variable="publisher-place"/>
-          <text variable="publisher"/>
-        </group>
-      </if>
-      <else-if type="thesis" match="any">
-        <group delimiter=", ">
-          <text variable="genre"/>
-          <text variable="publisher"/>
-        </group>
-      </else-if>
-      <else-if type="post-weblog webpage" match="none">
-        <group delimiter=", ">
-          <choose>
-            <if variable="event version" type="speech" match="none">
-              <text variable="genre"/>
-            </if>
-          </choose>
-          <choose>
-            <if type="article-journal article-magazine" match="none">
-              <group delimiter=": ">
-                <choose>
-                  <if variable="publisher-place">
-                    <text variable="publisher-place"/>
-                  </if>
-                  <else>
-                    <text variable="event-place"/>
-                  </else>
-                </choose>
-                <text variable="publisher"/>
-              </group>
-            </if>
-          </choose>
-        </group>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="event">
-    <choose>
-      <if variable="container-title" match="none">
-        <choose>
-          <if variable="event">
-            <choose>
-              <if variable="genre" match="none">
-                <text term="presented at" text-case="capitalize-first" suffix=" "/>
-                <text variable="event" quotes="true"/>
-              </if>
-              <else>
-                <group delimiter=" ">
-                  <text variable="genre" text-case="capitalize-first"/>
-                  <text term="presented at"/>
-                  <text variable="event" quotes="true"/>
-                </group>
-              </else>
-            </choose>
-          </if>
-          <else-if type="speech">
-            <text variable="genre" text-case="capitalize-first"/>
-          </else-if>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued">
-    <choose>
-      <if type="bill legal_case legislation" match="none">
-        <choose>
-          <if variable="issued">
-            <group prefix=" (" suffix=")" delimiter=", ">
-              <group>
-                <date variable="issued">
-                  <date-part name="year"/>
-                </date>
-                <text variable="year-suffix"/>
-                <choose>
-                  <if type="speech" match="any">
-                    <date variable="issued">
-                      <date-part prefix=", " name="month"/>
-                    </date>
-                  </if>
-                  <else-if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song dataset article-newspaper" match="none">
-                    <date variable="issued">
-                      <date-part prefix=", " name="month"/>
-                      <date-part prefix=" " name="day"/>
-                    </date>
-                  </else-if>
-                </choose>
-              </group>
-              <choose>
-                <if variable="author"/>
-                <else-if variable="editor">
-                  <text term="editor" form="short"/>
-                </else-if>
-                <else-if variable="translator">
-                  <text term="translator" form="short"/>
-                </else-if>
-              </choose>
-            </group>
-          </if>
-          <else-if variable="status">
-            <group prefix=" (" suffix=")">
-              <text variable="status"/>
-              <text variable="year-suffix" prefix="-"/>
-            </group>
-          </else-if>
-          <else>
-            <group prefix=" (" suffix=")" delimiter=", ">
-              <group>
-                <text term="no date" form="short"/>
-                <text variable="year-suffix" prefix="-"/>
-              </group>
-              <choose>
-                <if variable="author"/>
-                <else-if variable="editor">
-                  <text term="editor" form="short"/>
-                </else-if>
-                <else-if variable="translator">
-                  <text term="translator" form="short"/>
-                </else-if>
-              </choose>
-            </group>
-          </else>
-        </choose>
-      </if>
-    </choose>
-  </macro>
-  <macro name="issued-sort">
-    <choose>
-      <if type="article-journal bill book chapter graphic legal_case legislation motion_picture paper-conference report song dataset" match="none">
-        <date variable="issued">
-          <date-part name="year"/>
-          <date-part name="month"/>
-          <date-part name="day"/>
-        </date>
-      </if>
-      <else>
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-      </else>
-    </choose>
-  </macro>
-  <macro name="issued-year">
-    <choose>
-      <if variable="issued">
-        <group delimiter="/">
-          <date variable="original-date" form="text"/>
-          <group>
-            <date variable="issued">
-              <date-part name="year"/>
-            </date>
-            <text variable="year-suffix"/>
-          </group>
-        </group>
-      </if>
-      <else-if variable="status">
-        <text variable="status"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else-if>
-      <else>
-        <text term="no date" form="short"/>
-        <text variable="year-suffix" prefix="-"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition"/>
-      </else>
-    </choose>
-  </macro>
-  <macro name="locators">
-    <choose>
-      <if type="book graphic motion_picture report song chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
-        <group prefix=" (" suffix=")" delimiter=", ">
-          <choose>
-            <if type="report" match="none">
-              <text macro="edition"/>
-            </if>
-          </choose>
-          <choose>
-            <if variable="volume" match="any">
-              <group>
-                <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
-                <number variable="volume" form="numeric"/>
-              </group>
-            </if>
-            <else>
-              <group>
-                <text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
-                <number variable="number-of-volumes" form="numeric" prefix="1&#8211;"/>
-              </group>
-            </else>
-          </choose>
-          <group>
-            <text variable="page"/>
-          </group>
-        </group>
-      </if>
-      <else-if type="legal_case">
-        <group prefix=" (" suffix=")" delimiter=" ">
-          <text variable="authority"/>
-          <date variable="issued" form="text"/>
-        </group>
-      </else-if>
-      <else-if type="bill legislation" match="any">
-        <date variable="issued" prefix=" (" suffix=")">
-          <date-part name="year"/>
-        </date>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="citation-locator">
-    <group delimiter=" ">
-      <label text-case="sentence" variable="page" form="short"/>
-      <text variable="locator" prefix=" "/>
-    </group>
-  </macro>
-  <macro name="container">
-    <choose>
-      <if type="post-weblog webpage" match="none">
-        <group delimiter=" ">
-          <choose>
-            <if type="chapter paper-conference entry-encyclopedia" match="any">
-              <text term="in" text-case="capitalize-first" suffix=": "/>
-            </if>
-          </choose>
-          <text macro="container-contributors"/>
-          <text macro="secondary-contributors"/>
-          <text macro="container-title"/>
-          <choose>
-            <if type="article-newspaper">
-              <group prefix=" " delimiter=" ">
-                <text term="ad"/>
-                <date variable="issued" form="text"/>
-              </group>
-            </if>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <macro name="container-title">
-    <choose>
-      <if type="article article-journal article-magazine article-newspaper" match="any">
-        <group delimiter=", ">
-          <text variable="container-title" text-case="title" font-style="normal"/>
-          <group>
-            <text variable="volume"/>
-            <text variable="issue" prefix="(" suffix=")"/>
-          </group>
-          <group delimiter=" ">
-            <label plural="never" variable="page" form="short"/>
-            <text variable="page"/>
-          </group>
-        </group>
-      </if>
-      <else-if type="bill legal_case legislation" match="none">
-        <text variable="container-title"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="legal-cites">
-    <choose>
-      <if type="bill legal_case legislation" match="any">
-        <group delimiter=" " prefix=", ">
-          <choose>
-            <if variable="container-title">
-              <text variable="volume"/>
-              <text variable="container-title"/>
-              <group delimiter=" ">
-                <text term="section" form="symbol"/>
-                <text variable="section"/>
-              </group>
-              <text variable="page"/>
-            </if>
-            <else>
-              <choose>
-                <if type="legal_case">
-                  <text variable="number" prefix="No. "/>
-                </if>
-                <else>
-                  <text variable="number" prefix="Pub. L. No. "/>
-                  <group delimiter=" ">
-                    <text term="section" form="symbol"/>
-                    <text variable="section"/>
-                  </group>
-                </else>
-              </choose>
-            </else>
-          </choose>
-        </group>
-      </if>
-    </choose>
-  </macro>
-  <citation name-delimiter=", " et-al-min="4" et-al-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year">
-    <sort>
-      <key macro="author"/>
-      <key macro="issued-sort"/>
-    </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="issued-year"/>
-        <text macro="citation-locator"/>
-      </group>
-    </layout>
-  </citation>
-  <bibliography name-delimiter="; " et-al-min="12" et-al-use-first="6" et-al-use-last="true" initialize-with="." entry-spacing="0" hanging-indent="true">
-    <sort>
-      <key macro="author"/>
-      <key macro="issued-sort" sort="ascending"/>
-      <key macro="title"/>
-    </sort>
-    <layout>
-      <group delimiter=". ">
-        <group delimiter=" ">
-          <text macro="author"/>
-          <text macro="issued"/>
-          <text macro="title-plus-extra"/>
-        </group>
-        <group delimiter=", ">
-          <text macro="container"/>
-          <text macro="legal-cites"/>
-        </group>
-        <group delimiter=", ">
-          <text macro="event"/>
-          <text macro="edition"/>
-          <text macro="publisher"/>
-          <text macro="locators"/>
-        </group>
-        <text macro="access" prefix=" "/>
-      </group>
-    </layout>
-  </bibliography>
-</style>