diff --git a/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl b/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl
index 39b0a9b9baf..7c05b8dbd27 100644
--- a/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl
+++ b/associacao-brasileira-de-normas-tecnicas-ufrgs-initials.csl
@@ -8,7 +8,7 @@
     <link href="http://www.zotero.org/styles/associacao-brasileira-de-normas-tecnicas-ufrgs-initials" 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 -->
+    <!-- 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"/>
@@ -18,6 +18,10 @@
       <email>jacobsen@bc.ufrgs.br</email>
       <uri>https://www.ufrgs.br/bibliotecas/</uri>
     </author>
+    <author>
+      <name>Marina Plentz</name>
+      <email>marina.plentz@ufrgs.br</email>
+    </author>
     <author>
       <name>Luísia Feichas Alves</name>
       <email>luisia.alves@bc.ufrgs.br</email>
@@ -50,7 +54,7 @@
     <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-12-23T22:52:56-03:00</updated>
+    <updated>2021-07-29T23:01:56-03: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">
@@ -60,6 +64,7 @@
       <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>
@@ -174,11 +179,24 @@
   </macro>
   <macro name="composer">
     <!-- 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>
+    <choose>
+      <if type="musical_score">
+        <names variable="composer">
+          <name delimiter="; " delimiter-precedes-et-al="never" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
+            <name-part name="family" text-case="uppercase"/>
+            <name-part name="given"/>
+          </name>
+          <et-al font-style="italic"/>
+        </names>
+      </if>
+      <else>
+        <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>
+      </else>
+    </choose>
   </macro>
   <macro name="interviewer">
     <!-- Macro responsavel por mostrar o nome do entrevistador -->
@@ -208,8 +226,16 @@
     <!-- Macro responsável por mostrar o autor na citação -->
     <choose>
       <if type="broadcast motion_picture song" match="any">
-        <text variable="title" form="short" text-case="uppercase" quotes="false"/>
+        <text variable="title" form="short" text-case="uppercase"/>
       </if>
+      <else-if type="musical_score" match="any">
+        <names variable="composer">
+          <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>
+        </names>
+      </else-if>
       <else>
         <names variable="author">
           <name form="short" delimiter="; " delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all">
@@ -226,7 +252,7 @@
                 <text variable="title" form="short" text-case="uppercase"/>
               </if>
               <else>
-                <text variable="title" form="short" text-case="uppercase" quotes="false"/>
+                <text variable="title" form="short" text-case="uppercase"/>
               </else>
             </choose>
           </substitute>
@@ -237,59 +263,64 @@
   <macro name="access">
     <!-- Macro utilizada para apresentar a URL do site utilizado e data de acesso -->
     <choose>
-      <if variable="DOI" match="any">
-        <!-- Quando houver DOI, utilizá-lo no lugar do link -->
+      <if variable="ISSN">
         <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>
+        <text variable="URL" suffix=". "/>
+        <text macro="access-expression"/>
       </if>
-      <else-if variable="URL">
-        <choose>
-          <if type="book chapter" match="any">
-            <!-- 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 type="book chapter" match="any">
+        <!-- Quando for livro, incluir a expressão e-book em itálico -->
+        <text value="e-book" text-case="capitalize-first" font-style="italic" prefix=" " suffix="."/>
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="URL" suffix=". "/>
+        <text macro="access-expression"/>
       </else-if>
+      <else>
+        <text term="available at" text-case="capitalize-first" prefix=" " suffix=": "/>
+        <text variable="URL" suffix=". "/>
+        <text macro="access-expression"/>
+      </else>
     </choose>
   </macro>
+  <macro name="access-expression">
+    <!-- formato de acesso utiliza a macro accessed -->
+    <text term="accessed" text-case="capitalize-first"/>
+    <text term="at" text-case="lowercase" prefix=" " suffix=": "/>
+    <text macro="accessed"/>
+  </macro>
   <macro name="accessed">
     <!-- Macro utilizada para a data de acesso -->
-    <date variable="accessed" suffix="." delimiter=" ">
-      <date-part name="day"/>
-      <date-part name="month" form="short"/>
-      <date-part name="year"/>
+    <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="article-journal article-magazine article-newspaper chapter paper-conference post-weblog" match="any">
-        <text variable="title" font-weight="normal"/>
+      <if type="article-journal article-magazine article-newspaper chapter paper-conference " match="any">
+        <text variable="title" font-weight="normal" suffix=". "/>
       </if>
-      <else-if type="book entry-dictionary entry-encyclopedia patent report thesis" match="any">
+      <else-if type="bill legal_case legislation post-weblog" match="any">
+        <text variable="title" font-weight="normal"/>
+      </else-if>
+      <else-if type="entry-dictionary entry-encyclopedia">
+        <choose>
+          <if variable="container-author editor collection-editor" match="any">
+            <text variable="title" font-weight="normal" text-case="capitalize-first" suffix=". "/>
+          </if>
+          <else>
+            <text variable="title" font-weight="bold" text-case="capitalize-first" suffix=". "/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="book patent report thesis" match="any">
         <text variable="title" font-weight="bold"/>
       </else-if>
       <else-if type="dataset" match="any">
         <text variable="title" suffix=". "/>
       </else-if>
-      <else-if type="bill legal_case legislation" match="any">
-        <text variable="title" font-weight="bold"/>
-      </else-if>
       <else-if type="broadcast motion_picture song" match="any">
         <text variable="title" text-case="uppercase" suffix=". "/>
       </else-if>
@@ -344,9 +375,6 @@
           </else>
         </choose>
       </if>
-      <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">
@@ -404,58 +432,62 @@
         <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>
+              <group>
+                <date variable="issued" delimiter=" ">
+                  <date-part name="day"/>
+                  <date-part name="month" form="short"/>
+                </date>
+              </group>
+              <date variable="issued" date-parts="year" form="numeric" prefix=" "/>
             </if>
+            <else-if type="book" variable="ISSN">
+              <date variable="issued" date-parts="year" form="numeric" prefix=" " suffix="-"/>
+            </else-if>
+            <else>
+              <date variable="issued" date-parts="year" form="numeric" prefix=" "/>
+            </else>
           </choose>
-          <date variable="issued" date-parts="year" form="numeric" prefix=" "/>
         </else-if>
-        <else-if type="article-journal paper-conference" match="any">
+        <else>
           <choose>
-            <if variable="status" match="any">
+            <if type="article-journal">
               <text variable="status" font-style="italic"/>
             </if>
             <else>
               <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
             </else>
           </choose>
-        </else-if>
-        <else>
-          <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
         </else>
       </choose>
     </group>
   </macro>
   <macro name="issued-year">
     <!-- Macro responsável por mostrar apenas o ano -->
-    <choose>
-      <if variable="event-date" match="any">
-        <date date-parts="year" form="numeric" variable="event-date"/>
-      </if>
-      <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"/>
-      </else-if>
-      <else-if type="article-journal">
-        <choose>
-          <if variable="status" match="any">
-            <text variable="status" font-style="italic"/>
-          </if>
-          <else>
-            <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
-          </else>
-        </choose>
-      </else-if>
-      <else>
-        <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
-      </else>
-    </choose>
+    <group>
+      <choose>
+        <if variable="event-date" match="any">
+          <date date-parts="year" form="numeric" variable="event-date"/>
+        </if>
+        <else-if is-uncertain-date="issued">
+          <date variable="issued">
+            <date-part name="year" prefix="[" suffix="]"/>
+          </date>
+        </else-if>
+        <else-if variable="issued" match="any">
+          <choose>
+            <if type="book" variable="ISSN">
+              <date date-parts="year" form="numeric" variable="issued" suffix="-"/>
+            </if>
+            <else>
+              <date date-parts="year" form="numeric" variable="issued"/>
+            </else>
+          </choose>
+        </else-if>
+        <else>
+          <text value="s. d." font-style="italic" prefix="[" suffix="]"/>
+        </else>
+      </choose>
+    </group>
   </macro>
   <macro name="issued-legislation">
     <!-- Macro responsável por mostrar a data para documentos legislativos -->
@@ -485,10 +517,8 @@
             </group>
           </if>
           <else>
-            <group>
-              <text variable="edition"/>
-              <text term="edition" form="short" suffix="."/>
-            </group>
+            <text variable="edition"/>
+            <text term="edition" form="short" suffix="."/>
           </else>
         </choose>
       </if>
@@ -605,16 +635,22 @@
       </else>
     </choose>
   </macro>
-  <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">
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="by-cite" 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 -->
+      <key variable="year-suffix"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <!-- citações entre parênteses, separando mais de um documento com ponto-e-vírgula -->
+      <choose>
+        <if match="any" disambiguate="true">
+          <text variable="title" form="short" font-style="normal"/>
+        </if>
+      </choose>
       <choose>
         <if type="broadcast motion_picture song" match="any">
           <!-- documentos em que citação é pelo título -->
@@ -623,6 +659,14 @@
             <text macro="issued-year"/>
           </group>
         </if>
+        <else-if type="musical_score" match="any">
+          <!-- documentos em que citação é pelo título -->
+          <group>
+            <text macro="author-short" suffix=", "/>
+            <text macro="issued-year"/>
+            <text macro="citation-locator" prefix=", "/>
+          </group>
+        </else-if>
         <else>
           <!-- do contrário é o formato padrão de autor e data separados por vírgula -->
           <group>
@@ -638,6 +682,7 @@
     <!--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-short"/>
+      <key variable="year-suffix"/>
       <key macro="title"/>
       <!-- ordena primeiro pela macro autor -->
       <key variable="issued"/>
@@ -649,6 +694,7 @@
           <!-- Documento (Zotero) e Programa de computador (Mendeley) -->
           <group>
             <text macro="author" suffix=". "/>
+            <text variable="authority" suffix=". "/>
             <text macro="title" suffix=" "/>
             <text variable="medium" suffix=". "/>
             <!--incluído para ter a versão de programa de computador no mendeley-->
@@ -662,21 +708,14 @@
           <!-- Artigo de periódico e Artigo de revista  -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
+            <text variable="authority" suffix=". "/>
+            <text macro="title"/>
             <text variable="genre" suffix=". "/>
             <text macro="container-title" suffix=", "/>
             <text macro="place"/>
             <text macro="edition" suffix=", "/>
             <text macro="locators" suffix=", "/>
-            <choose>
-              <if variable="issued" match="none">
-                <text macro="issued"/>
-              </if>
-              <else>
-                <text macro="issued"/>
-                <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
-              </else>
-            </choose>
+            <text macro="issued"/>
             <text macro="access"/>
           </group>
         </else-if>
@@ -684,7 +723,8 @@
           <!-- Artigo de jornal -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
+            <text variable="authority" suffix=". "/>
+            <text macro="title"/>
             <text macro="container-title" suffix=", "/>
             <text macro="place" prefix=" "/>
             <text macro="locators"/>
@@ -693,24 +733,46 @@
         </else-if>
         <else-if type="bill">
           <!-- Audiência e Legislação -->
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text variable="abstract" prefix=". " suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text variable="publisher-place" suffix=": "/>
-            <text variable="publisher" suffix=", "/>
-            <text variable="authority" suffix=", "/>
-            <text macro="issued-legislation" suffix=". "/>
-            <text macro="section" prefix="Seção " suffix=", "/>
-            <text variable="page" prefix="p. " suffix="."/>
-            <text macro="access"/>
-          </group>
+          <choose>
+            <if variable="container-title" match="any">
+              <group>
+                <group delimiter=". " suffix=". ">
+                  <text macro="author"/>
+                  <text variable="authority"/>
+                  <text macro="title"/>
+                  <text variable="abstract"/>
+                </group>
+                <text macro="container-title" suffix=", "/>
+                <text macro="section" prefix="Seção " suffix=", "/>
+                <text variable="publisher-place" suffix=", "/>
+                <text variable="publisher" suffix=", "/>
+                <text variable="volume" prefix="v. " suffix=", "/>
+                <text variable="number" prefix="n. " suffix=", "/>
+                <text variable="page" prefix="p. " suffix=", "/>
+                <text macro="issued-legislation" suffix=". "/>
+                <text variable="genre" suffix=". "/>
+                <text macro="access"/>
+              </group>
+            </if>
+            <else>
+              <group>
+                <text macro="author" suffix=". "/>
+                <text variable="authority" suffix=". "/>
+                <text variable="title" font-weight="bold" suffix=". "/>
+                <text variable="abstract" suffix=". "/>
+                <text variable="publisher-place" suffix=", "/>
+                <text macro="issued-legislation" suffix=". "/>
+                <text variable="genre" suffix=". "/>
+                <text macro="access"/>
+              </group>
+            </else>
+          </choose>
         </else-if>
         <else-if type="book">
           <!-- Livro e, no Zotero, também Programa de computador -->
           <group>
             <text macro="author" suffix=". "/>
+            <text variable="authority" suffix=". "/>
             <text macro="title" suffix=". "/>
             <text macro="translator" suffix=". "/>
             <text variable="genre" suffix=". "/>
@@ -758,7 +820,8 @@
           <!-- Capítulo -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
+            <text variable="authority" suffix=". "/>
+            <text macro="title"/>
             <text term="in" text-case="capitalize-first" prefix=" " suffix=": " font-style="italic"/>
             <text macro="container-contributors" suffix=". "/>
             <text macro="container-title" suffix=". "/>
@@ -774,7 +837,8 @@
           <!-- verbetes -->
           <group>
             <text macro="author" suffix=". "/>
-            <text macro="title" suffix=". "/>
+            <text variable="authority" suffix=". "/>
+            <text macro="title"/>
             <text term="in" text-case="capitalize-first" font-style="italic" prefix=" " suffix=": "/>
             <text macro="container-contributors" suffix="."/>
             <text macro="container-title" prefix=" " suffix=". "/>
@@ -787,12 +851,14 @@
           <!-- Obra de arte -->
           <group>
             <text macro="author" suffix=". "/>
+            <text variable="authority" suffix=". "/>
             <text macro="title"/>
             <text macro="place"/>
             <text macro="issued-year" suffix=". "/>
             <text variable="medium" suffix=", "/>
             <text variable="dimensions" suffix=". "/>
             <text variable="genre" suffix="."/>
+            <text variable="archive" suffix="."/>
             <text macro="access"/>
           </group>
         </else-if>
@@ -810,34 +876,73 @@
         <else-if type="legal_case">
           <!-- Jurisprudência -->
           <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text variable="abstract" prefix=". " suffix=". "/>
-            <text macro="container-title" prefix="Relator: " suffix=", "/>
+            <group delimiter=". " suffix=". ">
+              <text macro="author"/>
+              <text variable="authority"/>
+              <text macro="title"/>
+              <text variable="abstract"/>
+              <text variable="medium"/>
+            </group>
+            <text macro="container-title" suffix=", "/>
             <text variable="publisher-place" suffix=", "/>
+            <group delimiter=", " suffix=", ">
+              <group>
+                <text term="volume" form="short" suffix=" "/>
+                <text variable="volume"/>
+              </group>
+              <group>
+                <text term="issue" form="short" suffix=" "/>
+                <text variable="number"/>
+              </group>
+              <group>
+                <text term="page" form="short"/>
+                <text variable="page"/>
+              </group>
+            </group>
             <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="legislation">
           <!-- Estatuto -->
-          <group>
-            <text macro="author" suffix=". "/>
-            <text macro="title"/>
-            <text variable="abstract" prefix=". " suffix=". "/>
-            <text macro="container-title" suffix=", "/>
-            <text macro="publisher"/>
-            <text macro="section" prefix="Seção " suffix=", "/>
-            <text variable="page" prefix="p. " suffix="."/>
-            <text macro="access"/>
-          </group>
+          <choose>
+            <if variable="container-title" match="any">
+              <group>
+                <group delimiter=". " suffix=". ">
+                  <text macro="author"/>
+                  <text variable="authority"/>
+                  <text macro="title"/>
+                  <text variable="abstract"/>
+                </group>
+                <text macro="container-title" suffix=": "/>
+                <text variable="chapter-number" suffix=", "/>
+                <text variable="publisher-place" suffix=", "/>
+                <text variable="volume" suffix=", "/>
+                <text variable="number" prefix="n. " suffix=", "/>
+                <text variable="page" prefix="p. " suffix=", "/>
+                <text macro="issued-legislation" suffix="."/>
+                <text macro="access"/>
+              </group>
+            </if>
+            <else>
+              <group>
+                <text macro="author" suffix=". "/>
+                <text variable="authority" suffix=". "/>
+                <text variable="title" font-weight="bold" suffix=". "/>
+                <text variable="abstract" suffix=". "/>
+                <text variable="publisher-place" suffix=": "/>
+                <text variable="publisher" suffix=", "/>
+                <text macro="issued-legislation" suffix="."/>
+                <text macro="access"/>
+              </group>
+            </else>
+          </choose>
         </else-if>
         <else-if type="manuscript">
-          <!-- Manuscrito e Partitura -->
+          <!-- Manuscrito -->
           <group>
             <text macro="author" suffix=". "/>
+            <text variable="authority" suffix=". "/>
             <text macro="title" suffix=" "/>
             <choose>
               <if variable="medium" match="any">
@@ -863,6 +968,7 @@
           <!-- Mapa -->
           <group>
             <text macro="author" suffix=". "/>
+            <text variable="authority" suffix=". "/>
             <text macro="title"/>
             <text macro="publisher"/>
             <text variable="genre" suffix=". "/>
@@ -870,26 +976,36 @@
             <text macro="access"/>
           </group>
         </else-if>
+        <else-if type="musical_score">
+          <!-- Partitura -->
+          <group>
+            <choose>
+              <if variable="composer" match="any">
+                <text macro="composer" suffix=". "/>
+              </if>
+              <else>
+                <text macro="author" suffix=". "/>
+              </else>
+            </choose>
+            <text macro="title" suffix=" "/>
+            <text variable="genre" suffix=". "/>
+            <text macro="publisher"/>
+            <text variable="medium" suffix="."/>
+            <text variable="archive" prefix=" " suffix="."/>
+            <text macro="access"/>
+          </group>
+        </else-if>
         <else-if type="paper-conference">
           <!-- trabalho em evento -->
           <text macro="author" suffix=". "/>
-          <text macro="title" suffix=". "/>
+          <text macro="title"/>
           <text macro="event"/>
           <text macro="container-contributors" text-case="uppercase"/>
           <text macro="secondary-contributors"/>
           <text macro="container-title"/>
           <text macro="locators"/>
-          <choose>
-            <if variable="issued" match="none">
-              <text macro="publisher"/>
-              <text variable="page" prefix=" p. " suffix="."/>
-            </if>
-            <else>
-              <text macro="publisher"/>
-              <text variable="page" prefix=" p. " suffix=". "/>
-              <text variable="status" suffix=". " font-style="italic" text-case="capitalize-first"/>
-            </else>
-          </choose>
+          <text macro="publisher"/>
+          <text variable="page" prefix=" p. " suffix="."/>
           <text macro="access"/>
         </else-if>
         <else-if type="patent">
@@ -921,9 +1037,10 @@
           <!-- Página web e Fórum -->
           <group>
             <text macro="author" suffix=". "/>
+            <text variable="authority" suffix=". "/>
             <text macro="title" suffix=" "/>
             <text macro="place"/>
-            <text macro="issued-year" suffix=". "/>
+            <text macro="issued"/>
             <text variable="genre" suffix=". "/>
             <text macro="access" suffix=". "/>
           </group>
@@ -931,9 +1048,12 @@
         <else-if type="post-weblog">
           <!-- Post -->
           <group>
-            <text macro="author"/>
-            <text macro="title" prefix=". "/>
-            <text term="in" font-style="italic" text-case="capitalize-first" prefix=". " suffix=": "/>
+            <group delimiter=". " suffix=". ">
+              <text macro="author"/>
+              <text variable="authority"/>
+              <text macro="title"/>
+            </group>
+            <text term="in" font-style="italic" text-case="capitalize-first" suffix=": "/>
             <text variable="container-title" text-case="uppercase" suffix=". "/>
             <text variable="publisher-place" suffix=", "/>
             <text macro="issued"/>
@@ -944,6 +1064,7 @@
           <!-- Relatório -->
           <group>
             <text macro="author" suffix=". "/>
+            <text variable="authority" suffix=". "/>
             <text macro="title"/>
             <text macro="container-contributors"/>
             <text macro="secondary-contributors"/>
@@ -981,8 +1102,8 @@
           <group>
             <text macro="author" suffix=". "/>
             <text macro="title" suffix=". "/>
-            <text variable="number-of-pages" suffix=" f. "/>
             <text macro="issued-year" suffix=". "/>
+            <text variable="number-of-pages" suffix=" f. "/>
             <text variable="genre"/>
             <text variable="publisher" prefix=" - " suffix=", "/>
             <text macro="place"/>
@@ -993,6 +1114,7 @@
         <else>
           <!-- Formato padrão para documentos não previstos -->
           <text macro="author" suffix=". "/>
+          <text variable="authority" suffix=". "/>
           <text macro="title"/>
           <text macro="container-contributors"/>
           <text macro="secondary-contributors"/>