diff --git a/buildres/csl/csl-locales/locales-ca-AD.xml b/buildres/csl/csl-locales/locales-ca-AD.xml
index d3ada321d48..66aaa0969fa 100644
--- a/buildres/csl/csl-locales/locales-ca-AD.xml
+++ b/buildres/csl/csl-locales/locales-ca-AD.xml
@@ -541,7 +541,7 @@
     <term name="editor" form="verb">editat per</term>
     <term name="editorial-director" form="verb">editat per</term>
     <term name="illustrator" form="verb">il·lustrat per</term>
-    <term name="interviewer" form="verb">entrevistat per</term>
+    <term name="interviewer" form="verb">entrevista feta per</term>
     <term name="recipient" form="verb">a</term>
     <term name="reviewed-author" form="verb">per</term>
     <term name="translator" form="verb">traduït per</term>
diff --git a/buildres/csl/csl-styles/american-sociological-association.csl b/buildres/csl/csl-styles/american-sociological-association.csl
index 71fc70746ff..15b0f8dba8b 100644
--- a/buildres/csl/csl-styles/american-sociological-association.csl
+++ b/buildres/csl/csl-styles/american-sociological-association.csl
@@ -16,7 +16,7 @@
     <category citation-format="author-date"/>
     <category field="sociology"/>
     <summary>The ASA style following the 6th edition of the Style Guide</summary>
-    <updated>2022-05-08T21:48:56+00:00</updated>
+    <updated>2023-07-16T21:48:56+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">
@@ -38,8 +38,7 @@
       <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always" initialize="false" initialize-with=". "/>
       <label form="short" prefix=", "/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <names variable="editor translator director"/>
         <choose>
           <if type="report">
             <text variable="publisher"/>
@@ -53,8 +52,7 @@
     <names variable="author">
       <name form="short" and="text" delimiter=", " initialize-with=". "/>
       <substitute>
-        <names variable="editor"/>
-        <names variable="translator"/>
+        <names variable="editor director translator"/>
         <choose>
           <if type="report">
             <text variable="publisher"/>
diff --git a/buildres/csl/csl-styles/apa-annotated-bibliography.csl b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
index 15d4d148658..8646210348b 100644
--- a/buildres/csl/csl-styles/apa-annotated-bibliography.csl
+++ b/buildres/csl/csl-styles/apa-annotated-bibliography.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-cv.csl b/buildres/csl/csl-styles/apa-cv.csl
index 8d36a8a8d21..dec03fa0e49 100644
--- a/buildres/csl/csl-styles/apa-cv.csl
+++ b/buildres/csl/csl-styles/apa-cv.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -534,13 +299,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -718,7 +481,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -728,7 +491,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -829,14 +592,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -855,7 +611,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -963,8 +719,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1013,8 +768,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1062,8 +816,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1105,18 +858,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1124,7 +875,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1363,83 +1114,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1458,7 +1182,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1487,8 +1211,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1505,8 +1228,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1522,8 +1244,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1558,8 +1279,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1581,8 +1301,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-eu.csl b/buildres/csl/csl-styles/apa-eu.csl
index 590d8c7425e..726552d9b69 100644
--- a/buildres/csl/csl-styles/apa-eu.csl
+++ b/buildres/csl/csl-styles/apa-eu.csl
@@ -21,12 +21,15 @@
     <updated>2022-01-31T14:30: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>
+<<<<<<< HEAD
   <locale xml:lang="eu">
     <terms>
       <term name="letter">komunikazio pertsonala</term>
       <term name="letter" form="short">gutuna</term>
     </terms>
   </locale>
+=======
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
   <!-- Modifications with respect to 'basic' apa.csl:
        - date-bib macro: fixed month prefix and added suffix
        - citation-locator, container-periodical & volume-booklike macros: reversed variable and label for page no.s, added correct delimiter
@@ -35,10 +38,19 @@
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
+<<<<<<< HEAD
        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
                  personal_communication report song speech thesis post webpage
        Legal: bill legal_case legislation treaty
+=======
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -114,8 +126,12 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
+<<<<<<< HEAD
               <!-- Replace with term="personal-communication" if that becomes available -->
               <text term="letter"/>
+=======
+              <text term="personal-communication"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
             </group>
           </if>
           <else>
@@ -357,6 +373,7 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+<<<<<<< HEAD
       <else-if type="bill">
         <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
         <choose>
@@ -366,14 +383,30 @@
           <else-if variable="title">
             <text variable="title" form="short" text-case="title"/>
           </else-if>
+=======
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
+      <else-if type="bill">
+        <!-- Bills are not italicized and substitute bill number if no title. -->
+        <choose>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
+          </if>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
+<<<<<<< HEAD
                     <!-- Replace with label variable="number" as that becomes available -->
                     <text term="issue" form="short"/>
+=======
+                    <label variable="number" form="short"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -416,6 +449,7 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
+<<<<<<< HEAD
                 <!-- This should be localized -->
                 <text value="patent" text-case="capitalize-first"/>
               </else>
@@ -423,6 +457,13 @@
             <group delimiter=" ">
               <!-- Replace with label variable="number" if that becomes available -->
               <text term="issue" form="short" text-case="capitalize-first"/>
+=======
+                <text term="patent" text-case="capitalize-first"/>
+              </else>
+            </choose>
+            <group delimiter=" ">
+              <label variable="number" form="short" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
               <text variable="number"/>
             </group>
           </group>
@@ -600,7 +641,11 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
+<<<<<<< HEAD
                           <text term="letter" form="short" text-case="capitalize-first"/>
+=======
+                          <text term="letter" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                         </else>
                       </choose>
                     </if>
@@ -610,7 +655,11 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
+<<<<<<< HEAD
                           <text term="letter" form="short" text-case="capitalize-first"/>
+=======
+                          <text term="letter" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                         </else>
                       </choose>
                     </else>
@@ -711,6 +760,7 @@
                 </if>
               </choose>
             </if>
+<<<<<<< HEAD
             <else-if type="book">
               <choose>
                 <if variable="version" match="none">
@@ -719,6 +769,9 @@
               </choose>
             </else-if>
             <else-if type="report" match="none">
+=======
+            <else-if type="report software" match="none">
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
               <text macro="format"/>
             </else-if>
           </choose>
@@ -730,8 +783,15 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
+<<<<<<< HEAD
           <!-- This should be localized -->
           <text macro="reviewed-title-intext" prefix="Review of "/>
+=======
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -752,7 +812,11 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
+<<<<<<< HEAD
                     <text term="letter" form="short" text-case="capitalize-first"/>
+=======
+                    <text term="letter" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -783,7 +847,11 @@
             </if>
           </choose>
         </if>
+<<<<<<< HEAD
         <else-if type="book" variable="version" match="all">
+=======
+        <else-if type="software" match="all">
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -891,8 +959,12 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
+<<<<<<< HEAD
                 <!-- Replace with label variable="number" if that becomes available -->
                 <text term="issue" form="short" text-case="capitalize-first"/>
+=======
+                <label variable="number" form="short" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                 <text variable="number"/>
               </if>
               <else>
@@ -941,8 +1013,12 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
+<<<<<<< HEAD
           <!-- replace with label variable="version" if that becomes available -->
           <text term="version" text-case="capitalize-first"/>
+=======
+          <label variable="version" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
           <text variable="version"/>
         </group>
       </if>
@@ -990,8 +1066,12 @@
         </if>
         <else>
           <group>
+<<<<<<< HEAD
             <!-- Replace with label variable="number-of-volumes" if that becomes available -->
             <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+=======
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1045,6 +1125,7 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
+<<<<<<< HEAD
       <!-- These should be localized when possible -->
       <else-if type="dataset">
         <text value="Data set"/>
@@ -1052,11 +1133,22 @@
       <else-if type="book" variable="version" match="all">
         <!-- Replace with type="software" and term="software" as that becomes available -->
         <text value="Computer software"/>
+=======
+      <else-if type="dataset">
+        <text term="dataset"/>
+      </else-if>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
+<<<<<<< HEAD
             <text term="letter" text-case="capitalize-first"/>
+=======
+            <text term="personal-communication" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1064,7 +1156,11 @@
         </choose>
       </else-if>
       <else-if type="map">
+<<<<<<< HEAD
         <text value="Map"/>
+=======
+        <text term="map" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
       </else-if>
     </choose>
   </macro>
@@ -1077,6 +1173,7 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
+<<<<<<< HEAD
       <!-- These should be localized when possible -->
       <else-if type="dataset">
         <text value="Data set"/>
@@ -1084,11 +1181,22 @@
       <else-if type="book" variable="version" match="all">
         <!-- Replace with type="software" and term="software" as that becomes available -->
         <text value="Computer software"/>
+=======
+      <else-if type="dataset">
+        <text term="dataset"/>
+      </else-if>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
+<<<<<<< HEAD
             <text term="letter" text-case="capitalize-first"/>
+=======
+            <text term="personal-communication" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1096,7 +1204,11 @@
         </choose>
       </else-if>
       <else-if type="map">
+<<<<<<< HEAD
         <text value="Map"/>
+=======
+        <text term="map"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
       </else-if>
     </choose>
   </macro>
@@ -1338,6 +1450,7 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+<<<<<<< HEAD
     <choose>
       <if type="legal_case">
         <group delimiter=". ">
@@ -1402,6 +1515,11 @@
         </group>
       </else-if>
       <else-if type="treaty">
+=======
+    <!-- TODO: Add new item types -->
+    <choose>
+      <if type="treaty">
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
         <!-- APA generally defers to Bluebook for legal citations, but diverges without
              explanation for treaty items. The Bluebook format that was used in APA 6th
              ed. is used here. -->
@@ -1414,7 +1532,45 @@
           <text macro="container-legal"/>
           <text macro="access"/>
         </group>
+<<<<<<< HEAD
       </else-if>
+=======
+      </if>
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
+        <group delimiter=". ">
+          <group delimiter=", ">
+            <choose>
+              <if type="bill legal_case legislation" match="any">
+                <text variable="title"/>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
+            </choose>
+            <group delimiter=" ">
+              <text macro="container-legal"/>
+              <text macro="date-legal"/>
+              <choose>
+                <if type="hearing">
+                  <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
+                    <name and="symbol" delimiter=", "/>
+                  </names>
+                </if>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
+                  <text variable="status" prefix="(" suffix=")"/>
+                </else-if>
+              </choose>
+            </group>
+            <text variable="references"/>
+          </group>
+          <text macro="access"/>
+        </group>
+      </else>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1433,7 +1589,11 @@
           </choose>
         </group>
       </if>
+<<<<<<< HEAD
       <else-if type="bill legislation" match="any">
+=======
+      <else-if type="bill legislation hearing" match="any">
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1462,8 +1622,12 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
+<<<<<<< HEAD
                   <!-- Change to label variable="section" as that becomes available -->
                   <text term="section" form="symbol"/>
+=======
+                  <label variable="section" form="symbol"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1480,8 +1644,12 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
+<<<<<<< HEAD
                     <!-- Replace with label variable="number" if that becomes available -->
                     <text term="issue" form="short" text-case="capitalize-first"/>
+=======
+                    <label variable="number" form="short" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1497,8 +1665,12 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
+<<<<<<< HEAD
                   <!-- Replace with label variable="number" as that becomes available -->
                   <text term="issue" form="short"/>
+=======
+                  <label variable="number" form="short"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                 </if>
               </choose>
               <text variable="number"/>
@@ -1533,8 +1705,12 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
+<<<<<<< HEAD
                     <!-- Change to label variable="section" as that becomes available -->
                     <text term="section" form="symbol"/>
+=======
+                    <label variable="section" form="symbol"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1556,8 +1732,12 @@
             </if>
             <else>
               <group delimiter=" ">
+<<<<<<< HEAD
                 <!-- Replace with label variable="number" if that becomes available -->
                 <text term="issue" form="short" text-case="capitalize-first"/>
+=======
+                <label variable="number" form="short" text-case="capitalize-first"/>
+>>>>>>> 696211c2104991f29672652303cf169af4671cab
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-no-ampersand.csl b/buildres/csl/csl-styles/apa-no-ampersand.csl
index 35af4cce24f..b26a8426573 100644
--- a/buildres/csl/csl-styles/apa-no-ampersand.csl
+++ b/buildres/csl/csl-styles/apa-no-ampersand.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
-                    <name and="text" delimiter=", "/>
+                    <!-- TODO: Localize this with the hearing term. -->
+                    <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-no-initials.csl b/buildres/csl/csl-styles/apa-no-initials.csl
index 74fe1e3dfc0..4fc744b9b03 100644
--- a/buildres/csl/csl-styles/apa-no-initials.csl
+++ b/buildres/csl/csl-styles/apa-no-initials.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize="false" initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
index 948b03600e0..53c2f69fed4 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript-brackets.csl
@@ -36,51 +36,30 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
@@ -90,43 +69,27 @@
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -202,8 +165,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -441,23 +403,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
           </if>
-          <else-if variable="title">
-            <text variable="title" form="short"/>
-          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -500,13 +462,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -684,7 +644,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -694,7 +654,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -795,14 +755,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -814,8 +767,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -836,7 +791,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -867,7 +822,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -975,8 +930,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1025,8 +979,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1074,8 +1027,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1129,18 +1081,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1148,7 +1098,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1161,18 +1111,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1180,7 +1128,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1419,83 +1367,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1514,7 +1435,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1543,8 +1464,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1561,8 +1481,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1578,8 +1497,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1614,8 +1532,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1637,8 +1554,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-numeric-superscript.csl b/buildres/csl/csl-styles/apa-numeric-superscript.csl
index 2a2d81cbde2..5e15fc48c4f 100644
--- a/buildres/csl/csl-styles/apa-numeric-superscript.csl
+++ b/buildres/csl/csl-styles/apa-numeric-superscript.csl
@@ -36,51 +36,30 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
@@ -90,43 +69,27 @@
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -202,8 +165,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -441,23 +403,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic and title case -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
+          <if variable="title">
+            <text variable="title" form="short" text-case="title"/>
           </if>
-          <else-if variable="title">
-            <text variable="title" form="short"/>
-          </else-if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -500,13 +462,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -684,7 +644,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -694,7 +654,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -795,14 +755,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -814,8 +767,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -836,7 +791,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -867,7 +822,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -975,8 +930,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1025,8 +979,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1074,8 +1027,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1129,18 +1081,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1148,7 +1098,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1161,18 +1111,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1180,7 +1128,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1419,83 +1367,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1514,7 +1435,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1543,8 +1464,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1561,8 +1481,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1578,8 +1497,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1614,8 +1532,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1637,8 +1554,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-single-spaced.csl b/buildres/csl/csl-styles/apa-single-spaced.csl
index 8765b40f36e..2793e6ac5eb 100644
--- a/buildres/csl/csl-styles/apa-single-spaced.csl
+++ b/buildres/csl/csl-styles/apa-single-spaced.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
-        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
-        Periodical or Booklike: paper-conference
-        Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
-                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                  personal_communication report song speech thesis post webpage
-        Legal: bill legal_case legislation treaty
+       Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
+       Periodical or Booklike: paper-conference
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
+                 graphic interview manuscript map motion_picture musical_score pamphlet patent
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-              For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-              explanation for treaty items. The Bluebook format that was used in APA 6th
-              ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa-with-abstract.csl b/buildres/csl/csl-styles/apa-with-abstract.csl
index 1e5430b81ba..d16cd2cbcf7 100644
--- a/buildres/csl/csl-styles/apa-with-abstract.csl
+++ b/buildres/csl/csl-styles/apa-with-abstract.csl
@@ -35,295 +35,60 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
@@ -399,8 +164,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -638,23 +402,23 @@
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -697,13 +461,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -881,7 +643,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -891,7 +653,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -992,14 +754,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1011,8 +766,10 @@
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1033,7 +790,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1064,7 +821,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1172,8 +929,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1222,8 +978,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1271,8 +1026,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1326,18 +1080,16 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1345,7 +1097,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
@@ -1358,18 +1110,16 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1377,7 +1127,7 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
@@ -1616,83 +1366,56 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
@@ -1711,7 +1434,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1740,8 +1463,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1758,8 +1480,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1775,8 +1496,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1811,8 +1531,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
-                    <text term="section" form="symbol"/>
+                    <label variable="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
                 </if>
@@ -1834,8 +1553,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
diff --git a/buildres/csl/csl-styles/apa.csl b/buildres/csl/csl-styles/apa.csl
index 0d11d0702e8..772c25e3345 100644
--- a/buildres/csl/csl-styles/apa.csl
+++ b/buildres/csl/csl-styles/apa.csl
@@ -35,298 +35,88 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
+  <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
+  <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
+  <!-- TODO: New variables:
+         available-date submitted
+         part-number printing-number supplement-number
+         part-title volume-title
+         archive_collection
+         division jurisdiction
+         event-title
+         language
+         license
+         reviewed-genre
+  -->
+  <!-- TODO: New terms:
+         advance-online-publication
+         album on audio-recording
+         original-work-published
+         personal-communication
+         preprint
+         review-of
+         item types
+  -->
+  <!-- TODO: Check Indigeneous Knowledge format -->
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
+    <!-- TODO: New creator roles (media, contributor) -->
+    <!-- TODO: Add new item types -->
     <names variable="composer" delimiter=", ">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <substitute>
@@ -355,7 +145,7 @@
             </choose>
           </if>
         </choose>
-        <!-- Test for editortranslator and put that first as that becomes available -->
+        <!-- TODO: Test for editortranslator and put that first as that becomes available -->
         <names variable="editor" delimiter=", ">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
           <label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -383,6 +173,8 @@
     </names>
   </macro>
   <macro name="author-intext">
+    <!-- TODO: New creator roles -->
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
@@ -399,8 +191,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -438,6 +229,7 @@
     </choose>
   </macro>
   <macro name="date-bib">
+    <!-- TODO: Add new item types -->
     <group delimiter=" " prefix="(" suffix=")">
       <choose>
         <if is-uncertain-date="issued">
@@ -476,6 +268,7 @@
           </if>
           <else-if variable="status">
             <group>
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="lowercase"/>
               <text variable="year-suffix" prefix="-"/>
             </group>
@@ -503,6 +296,7 @@
     </choose>
   </macro>
   <macro name="date-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -550,6 +344,7 @@
         </group>
       </if>
       <else-if variable="status">
+        <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
         <text variable="status" text-case="lowercase"/>
         <text variable="year-suffix" prefix="-"/>
       </else-if>
@@ -579,6 +374,7 @@
     </choose>
   </macro>
   <macro name="title">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
@@ -600,7 +396,7 @@
               <if variable="collection-editor editor editorial-director" match="any">
                 <group delimiter=": " font-style="italic">
                   <text variable="title"/>
-                  <!-- Replace with volume-title as that becomes available -->
+                  <!-- TODO: Replace with volume-title -->
                   <choose>
                     <if is-numeric="volume" match="none">
                       <group delimiter=" ">
@@ -619,7 +415,7 @@
           <else>
             <group delimiter=": " font-style="italic">
               <text variable="title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -635,27 +431,28 @@
     </choose>
   </macro>
   <macro name="title-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -686,6 +483,7 @@
     </choose>
   </macro>
   <macro name="parenthetical">
+    <!-- TODO: Add new item types -->
     <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
@@ -698,13 +496,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -741,6 +537,7 @@
     </group>
   </macro>
   <macro name="parenthetical-container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group prefix="(" suffix=")">
@@ -759,6 +556,7 @@
     </choose>
   </macro>
   <macro name="bracketed">
+    <!-- TODO: Add new item types -->
     <!-- [Descriptive information] -->
     <!-- If there is a number, genre is already printed in macro="number" -->
     <group prefix="[" suffix="]">
@@ -779,7 +577,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </else-if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -790,7 +590,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -882,7 +684,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -892,7 +694,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -927,20 +729,20 @@
                   <choose>
                     <if variable="genre">
                       <text variable="genre" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else-if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </else-if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -953,13 +755,13 @@
                   <choose>
                     <if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -993,14 +795,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1009,11 +804,14 @@
     </group>
   </macro>
   <macro name="bracketed-intext">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1034,7 +832,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1055,6 +853,7 @@
     </group>
   </macro>
   <macro name="bracketed-container">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if type="paper-conference speech" match="any">
@@ -1065,7 +864,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1077,6 +876,8 @@
     </group>
   </macro>
   <macro name="secondary-contributors">
+    <!-- TODO: Add new item types -->
+    <!-- TODO: Add new creator roles -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <text macro="secondary-contributors-periodical"/>
@@ -1113,6 +914,7 @@
     </group>
   </macro>
   <macro name="secondary-contributors-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if variable="title">
@@ -1122,7 +924,7 @@
           </names>
         </if>
       </choose>
-      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
       <choose>
         <if type="post webpage" match="none">
           <!-- Webpages treat container-title like publisher -->
@@ -1160,12 +962,13 @@
     <choose>
       <if variable="archive-place" match="none">
         <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <!-- Add archive_collection as that becomes available -->
+        <!-- TODO: Add archive_collection -->
         <text variable="archive_location"/>
       </if>
     </choose>
   </macro>
   <macro name="number">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="number">
         <group delimiter=", ">
@@ -1173,8 +976,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1197,6 +999,7 @@
     </choose>
   </macro>
   <macro name="locators-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
       <else-if type="paper-conference">
@@ -1223,8 +1026,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1247,6 +1049,7 @@
     </choose>
   </macro>
   <macro name="volume-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter=", ">
       <!-- Report series [ex. 52] -->
       <choose>
@@ -1259,6 +1062,7 @@
       </choose>
       <choose>
         <if variable="volume" match="any">
+          <!-- TODO: Update using volume-title -->
           <choose>
             <!-- Non-numeric volumes are already printed as part of the book title -->
             <if is-numeric="volume" match="none"/>
@@ -1272,8 +1076,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1315,6 +1118,7 @@
     </choose>
   </macro>
   <macro name="format">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre medium" match="any">
         <group delimiter="; ">
@@ -1327,18 +1131,17 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1346,11 +1149,12 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="format-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre" match="any">
         <text variable="genre" text-case="capitalize-first"/>
@@ -1359,18 +1163,17 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1378,13 +1181,14 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
   <!-- APA 'source' element contains four parts:
        container, event, publisher, access -->
   <macro name="container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <!-- Periodical items -->
@@ -1440,6 +1244,7 @@
         <if variable="issued">
           <choose>
             <if variable="issue page volume" match="none">
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="capitalize-first"/>
             </if>
           </choose>
@@ -1448,13 +1253,14 @@
     </group>
   </macro>
   <macro name="container-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <names variable="editor translator" delimiter=", &amp; ">
-              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <!-- TODO: Change to editortranslator and move editor to substitute -->
               <name and="symbol" initialize-with=". " delimiter=", "/>
               <label form="short" text-case="title" prefix=" (" suffix=")"/>
               <substitute>
@@ -1465,7 +1271,7 @@
             </names>
             <group delimiter=": " font-style="italic">
               <text variable="container-title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -1483,6 +1289,7 @@
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if type="thesis">
@@ -1517,7 +1324,7 @@
             <!-- With `archive-place`: physical archives. Without: online archives. -->
             <!-- For physical archives, print the location before the archive name.
                 For electronic archives, these are printed in macro="description". -->
-            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
             <!-- Must test for archive_collection:
                 With collection: archive_collection (archive_location), archive, archive-place
                 No collection: archive (archive_location), archive-place
@@ -1552,6 +1359,7 @@
     </choose>
   </macro>
   <macro name="event">
+    <!-- TODO: Add new item types (e.g., event, collection, performance) -->
     <choose>
       <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
@@ -1584,6 +1392,7 @@
   </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="patent" match="none">
         <group prefix="(" suffix=")">
@@ -1595,6 +1404,7 @@
               <text variable="references"/>
             </if>
             <else>
+              <!-- TODO: Replace these with terms -->
               <group delimiter=" ">
                 <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
@@ -1617,86 +1427,60 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="legal_case">
         <group prefix="(" suffix=")" delimiter=" ">
@@ -1712,7 +1496,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1731,6 +1515,7 @@
     </choose>
   </macro>
   <macro name="container-legal">
+    <!-- TODO: Add new item types -->
     <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
@@ -1741,8 +1526,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1759,8 +1543,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1776,8 +1559,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1812,7 +1594,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
+                    <!-- TODO: Change to label variable="section" -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
@@ -1835,8 +1617,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1846,6 +1627,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- TODO: Add new locator types? -->
     <group delimiter=" ">
       <choose>
         <if locator="chapter">
@@ -1883,6 +1665,7 @@
     </sort>
     <layout>
       <choose>
+        <!-- TODO: Add new item types -->
         <if type="bill legal_case legislation treaty" match="any">
           <!-- Legal items have different orders and delimiters -->
           <choose>
diff --git a/buildres/csl/csl-styles/journal-of-emerging-investigators.csl b/buildres/csl/csl-styles/journal-of-emerging-investigators.csl
new file mode 100644
index 00000000000..81b661b22a6
--- /dev/null
+++ b/buildres/csl/csl-styles/journal-of-emerging-investigators.csl
@@ -0,0 +1,324 @@
+<?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="minimal-two">
+  <!-- STYLE META DATA -->
+  <info>
+    <title>Journal of Emerging Investigators</title>
+    <title-short>JEI</title-short>
+    <id>http://www.zotero.org/styles/journal-of-emerging-investigators</id>
+    <link href="http://www.zotero.org/styles/journal-of-emerging-investigators" rel="self"/>
+    <link href="https://github.com/SirohiKumar/MANUSCRIPT-FORMATTING/blob/main/documentation.html" rel="documentation"/>
+    <contributor>
+      <name>Sirohi Kumar</name>
+      <email>sirohigkumar@icloud.com</email>
+    </contributor>
+    <category citation-format="author"/>
+    <category field="generic-base"/>
+    <summary>This style is based on the MLA 9th edition handbook, with adaptations made to the in-text citation style, following the guidelines of the Journal of Emerging Investigators.</summary>
+    <updated>2023-07-07T23:56:30+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>
+  <!-- MACROS -->
+  <locale xml:lang="en">
+    <date form="text">
+      <date-part name="day" suffix=" "/>
+      <date-part name="month" suffix=" " form="short"/>
+      <date-part name="year"/>
+    </date>
+    <terms>
+      <term name="month-01" form="short">Jan.</term>
+      <term name="month-02" form="short">Feb.</term>
+      <term name="month-03" form="short">Mar.</term>
+      <term name="month-04" form="short">Apr.</term>
+      <term name="month-05" form="short">May</term>
+      <term name="month-06" form="short">June</term>
+      <term name="month-07" form="short">July</term>
+      <term name="month-08" form="short">Aug.</term>
+      <term name="month-09" form="short">Sept.</term>
+      <term name="month-10" form="short">Oct.</term>
+      <term name="month-11" form="short">Nov.</term>
+      <term name="month-12" form="short">Dec.</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="first" and="text" delimiter-precedes-last="always" delimiter-precedes-et-al="always" initialize="false" initialize-with=". "/>
+      <label form="long" prefix=", "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="container-title" match="any">
+        <text variable="title" quotes="true" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title" font-style="italic" text-case="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <text variable="container-title" font-style="italic" text-case="title"/>
+  </macro>
+  <macro name="other-contributors">
+    <choose>
+      <if variable="container-title" match="any">
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+          <names variable="director illustrator interviewer" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text"/>
+          </names>
+        </group>
+      </if>
+      <else>
+        <group delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+          <names variable="director illustrator interviewer" delimiter=", ">
+            <label form="verb" suffix=" " text-case="capitalize-first"/>
+            <name and="text"/>
+          </names>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="version">
+    <group delimiter=", ">
+      <choose>
+        <if is-numeric="edition">
+          <group delimiter=" ">
+            <number variable="edition" form="ordinal"/>
+            <text term="edition" form="short"/>
+          </group>
+        </if>
+        <else>
+          <text variable="edition" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="version"/>
+      <text variable="medium"/>
+    </group>
+  </macro>
+  <macro name="volume-lowercase">
+    <group delimiter=" ">
+      <text term="volume" form="short"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="number">
+    <group delimiter=", ">
+      <group>
+        <choose>
+          <!--lowercase if we have a preceding element-->
+          <if variable="edition container-title" match="any">
+            <text macro="volume-lowercase"/>
+          </if>
+          <!--other contributors preceding the volume-->
+          <else-if variable="author" match="all">
+            <choose>
+              <if variable="editor translator container-author illustrator interviewer director" match="any">
+                <text macro="volume-lowercase"/>
+              </if>
+            </choose>
+          </else-if>
+          <else-if variable="editor" match="all">
+            <choose>
+              <if variable="translator container-author illustrator interviewer director" match="any">
+                <text macro="volume-lowercase"/>
+              </if>
+            </choose>
+          </else-if>
+          <else-if variable="container-author illustrator interviewer director" match="any">
+            <text macro="volume-lowercase"/>
+          </else-if>
+          <else>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="capitalize-first"/>
+              <text variable="volume"/>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <group delimiter=" ">
+        <text term="issue" form="short"/>
+        <text variable="issue"/>
+      </group>
+      <choose>
+        <if type="report">
+          <text variable="genre"/>
+        </if>
+      </choose>
+      <text variable="number"/>
+    </group>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="article-magazine article-newspaper article-journal" match="none">
+        <text variable="publisher"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publication-date">
+    <choose>
+      <if type="book chapter paper-conference motion_picture" match="any">
+        <date variable="issued" form="numeric" date-parts="year"/>
+      </if>
+      <else-if type="article-journal" match="any">
+        <date variable="issued" form="text" date-parts="year-month"/>
+      </else-if>
+      <else-if type="speech" match="none">
+        <date variable="issued" form="text"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="location">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <label variable="page" form="short"/>
+        <text variable="page"/>
+      </group>
+      <choose>
+        <if variable="source" match="none">
+          <text macro="URI"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="container2-title">
+    <group delimiter=", ">
+      <choose>
+        <if type="speech">
+          <text variable="event"/>
+          <date variable="event-date" form="text"/>
+          <text variable="event-place"/>
+        </if>
+      </choose>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+      <text variable="archive_location"/>
+    </group>
+  </macro>
+  <macro name="container2-location">
+    <choose>
+      <if variable="source">
+        <choose>
+          <if variable="DOI URL" match="any">
+            <group delimiter=", ">
+              <text variable="source" font-style="italic"/>
+              <text macro="URI"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="URI">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else>
+        <text variable="URL"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="accessed">
+    <!--using accessed where we don't have an issued date; follows recommendation on p. 53 -->
+    <choose>
+      <if variable="issued" match="none">
+        <group delimiter=" ">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date variable="accessed" form="text"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="citation-locator">
+    <group delimiter=" ">
+      <choose>
+        <if locator="page">
+          <label variable="locator" form="short"/>
+        </if>
+        <else>
+          <label variable="locator" form="short" text-case="capitalize-first"/>
+        </else>
+      </choose>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <!-- IN TEXT CITATION -->
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <choose>
+        <if locator="page line" match="any">
+          <group delimiter=" ">
+            <text variable="citation-number"/>
+            <text macro="citation-locator"/>
+          </group>
+        </if>
+        <else>
+          <group delimiter=", ">
+            <text macro="citation-locator"/>
+            <group>
+              <label variable="citation-number"/>
+              <text variable="citation-number"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+    </layout>
+  </citation>
+  <!-- BIBLIOGRAPHY -->
+  <bibliography hanging-indent="true" et-al-min="2" et-al-use-first="1" line-spacing="2" entry-spacing="0" subsequent-author-substitute="---">
+    <sort>
+      <key variable="citation-number"/>
+      <key macro="citation-locator"/>
+    </sort>
+    <layout suffix=".">
+      <text variable="citation-number" prefix="" suffix=") "/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <text macro="title"/>
+        <date variable="original-date" form="numeric" date-parts="year"/>
+        <group delimiter=", ">
+          <!---This group corresponds to MLA's "Container 1"-->
+          <text macro="container-title"/>
+          <text macro="other-contributors"/>
+          <text macro="version"/>
+          <text macro="number"/>
+          <text macro="publisher"/>
+          <text macro="publication-date"/>
+          <text macro="location"/>
+        </group>
+        <group delimiter=", ">
+          <!---This group corresponds to MLA's "Container 2"-->
+          <!--currently just using this one for archival info-->
+          <text macro="container2-title"/>
+          <text macro="container2-location"/>
+        </group>
+        <text macro="accessed"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/journal-of-experimental-botany.csl b/buildres/csl/csl-styles/journal-of-experimental-botany.csl
index 3b2791df719..7d736286ee7 100644
--- a/buildres/csl/csl-styles/journal-of-experimental-botany.csl
+++ b/buildres/csl/csl-styles/journal-of-experimental-botany.csl
@@ -2,18 +2,23 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB">
   <info>
     <title>Journal of Experimental Botany</title>
+    <title-short>JXB</title-short>
     <id>http://www.zotero.org/styles/journal-of-experimental-botany</id>
     <link href="http://www.zotero.org/styles/journal-of-experimental-botany" rel="self"/>
     <link href="http://www.oxfordjournals.org/our_journals/exbotj/for_authors/index.html" rel="documentation"/>
+    <link href="https://academic.oup.com/jxb/pages/manuscript-preparation?login=false#References" rel="documentation"/>
     <author>
       <name>Johan Asplund</name>
       <email>asplundj@gmail.com</email>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author-date"/>
     <category field="biology"/>
     <issn>0022-0957</issn>
     <eissn>1460-2431</eissn>
-    <updated>2013-08-29T04:18:55+00:00</updated>
+    <updated>2023-07-18T12:32:23+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <macro name="editor-translator">
@@ -69,79 +74,134 @@
       <text variable="publisher"/>
     </group>
   </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-journal article" match="any">
+        <choose>
+          <if match="none" variable="volume page">
+            <choose>
+              <if match="any" variable="DOI">
+                <text variable="DOI" prefix="doi: "/>
+                <choose>
+                  <if type="article" match="any">
+                    <text term="preprint" text-case="capitalize-first" prefix=". [" suffix="]"/>
+                  </if>
+                </choose>
+              </if>
+              <else>
+                <text term="in press" font-style="italic"/>
+              </else>
+            </choose>
+          </if>
+        </choose>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <group delimiter=". ">
+          <text variable="URL"/>
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date date-parts="year-month" form="text" variable="accessed"/>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
   <citation collapse="year-suffix" et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" year-suffix-delimiter=",">
     <sort>
-      <key variable="issued"/>
+      <key macro="year-date"/>
       <key variable="author"/>
     </sort>
     <layout prefix="(" suffix=")" delimiter="; ">
       <group delimiter=", ">
         <text macro="author-short"/>
         <group>
-          <date variable="issued">
-            <date-part name="year"/>
-          </date>
+          <text macro="year-date"/>
           <text variable="year-suffix" font-style="italic"/>
         </group>
         <group>
           <label variable="locator"/>
           <text variable="locator" prefix=" "/>
         </group>
+        <choose>
+          <if type="article" match="any">
+            <text term="preprint" text-case="capitalize-first"/>
+          </if>
+        </choose>
       </group>
     </layout>
   </citation>
   <bibliography et-al-min="11" et-al-use-first="3" hanging-indent="false">
     <sort>
       <key macro="author-short"/>
-      <key variable="issued"/>
+      <key macro="year-date"/>
     </sort>
-    <layout>
-      <text macro="author" suffix=". " font-weight="bold"/>
-      <group suffix=".">
-        <date variable="issued">
-          <date-part name="year"/>
-        </date>
-        <text variable="year-suffix" font-style="italic"/>
-      </group>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <text prefix=" " suffix="." macro="publisher"/>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <text macro="title" prefix=" "/>
-          <group prefix=".">
-            <group>
-              <group suffix=".">
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="author" font-weight="bold"/>
+        <group>
+          <text macro="year-date"/>
+          <text variable="year-suffix" font-style="italic"/>
+        </group>
+        <text macro="title"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group suffix=".">
+              <text macro="editor-translator" prefix=" "/>
+            </group>
+            <text prefix=" " suffix="." macro="publisher"/>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
                 <names variable="editor translator">
-                  <name prefix=" In: " suffix="," delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
-                  <label form="short" prefix=" "/>
+                  <name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
+                  <label form="short" prefix=", "/>
                 </names>
-                <text variable="collection-title" prefix=" " suffix="."/>
-                <text variable="container-title" prefix=" " suffix="."/>
-                <text macro="publisher" prefix=" " suffix=", "/>
-                <text variable="page" suffix="."/>
+              </group>
+              <text variable="collection-title" prefix=" " suffix="."/>
+              <text variable="container-title" prefix=" " suffix="."/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text variable="page"/>
               </group>
             </group>
-          </group>
-        </else-if>
-        <else>
-          <group suffix=".">
-            <text macro="title" prefix=" "/>
-            <text macro="editor-translator" prefix=" "/>
-          </group>
-          <group prefix=" " suffix=".">
-            <text variable="container-title"/>
-            <group prefix=" ">
-              <text variable="volume" font-weight="bold"/>
+          </else-if>
+          <else-if type="article" match="any">
+            <group delimiter=" ">
+              <text variable="publisher"/>
+              <text macro="access"/>
             </group>
-            <text variable="page" prefix=", "/>
-          </group>
-        </else>
-      </choose>
+          </else-if>
+          <else-if type="thesis" match="any">
+            <group delimiter=", ">
+              <text variable="genre"/>
+              <text variable="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <text macro="access"/>
+          </else-if>
+          <else>
+            <group delimiter=". " suffix=".">
+              <text macro="editor-translator"/>
+              <group delimiter=", ">
+                <group delimiter=" " prefix=" ">
+                  <text variable="container-title"/>
+                  <text variable="volume" font-weight="bold"/>
+                  <text macro="access"/>
+                </group>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/modern-language-association.csl b/buildres/csl/csl-styles/modern-language-association.csl
index 26b92bdff12..4530d255dad 100644
--- a/buildres/csl/csl-styles/modern-language-association.csl
+++ b/buildres/csl/csl-styles/modern-language-association.csl
@@ -9,10 +9,13 @@
     <author>
       <name>Sebastian Karcher</name>
     </author>
+    <contributor>
+      <name>Patrick O'Brien</name>
+    </contributor>
     <category citation-format="author"/>
     <category field="generic-base"/>
     <summary>This style adheres to the MLA 9th edition handbook. Follows the structure of references as outlined in the MLA Manual closely</summary>
-    <updated>2021-07-13T20:05:10+00:00</updated>
+    <updated>2023-07-21T20:05:10+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
   <locale xml:lang="en">
@@ -195,9 +198,18 @@
   </macro>
   <macro name="publisher">
     <choose>
-      <if type="article-magazine article-newspaper article-journal" match="none">
-        <text variable="publisher"/>
+      <if type="thesis" match="any">
+        <group delimiter=". ">
+          <date variable="issued" form="numeric" date-parts="year"/>
+          <group delimiter=", ">
+            <text variable="publisher"/>
+            <text variable="genre"/>
+          </group>
+        </group>
       </if>
+      <else-if type="article-magazine article-newspaper article-journal" match="none">
+        <text variable="publisher"/>
+      </else-if>
     </choose>
   </macro>
   <macro name="publication-date">
@@ -208,7 +220,7 @@
       <else-if type="article-journal" match="any">
         <date variable="issued" form="text" date-parts="year-month"/>
       </else-if>
-      <else-if type="speech" match="none">
+      <else-if type="speech thesis" match="none">
         <date variable="issued" form="text"/>
       </else-if>
     </choose>
diff --git a/src/main/resources/csl-styles/apa.csl b/src/main/resources/csl-styles/apa.csl
index 0d11d0702e8..772c25e3345 100644
--- a/src/main/resources/csl-styles/apa.csl
+++ b/src/main/resources/csl-styles/apa.csl
@@ -35,298 +35,88 @@
       <term name="circa" form="short">ca.</term>
       <term name="bc"> B.C.E.</term>
       <term name="ad"> C.E.</term>
-      <term name="letter">personal communication</term>
-      <term name="letter" form="short">letter</term>
       <term name="issue" form="long">
         <single>issue</single>
         <multiple>issues</multiple>
       </term>
-    </terms>
-  </locale>
-  <locale xml:lang="af">
-    <terms>
-      <term name="letter">persoonlike kommunikasie</term>
-      <term name="letter" form="short">brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ar">
-    <terms>
-      <term name="letter">اتصال شخصي</term>
-      <term name="letter" form="short">خطاب</term>
-    </terms>
-  </locale>
-  <locale xml:lang="bg">
-    <terms>
-      <term name="letter">лична комуникация</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ca">
-    <terms>
-      <term name="letter">comunicació personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cs">
-    <terms>
-      <term name="letter">osobní komunikace</term>
-      <term name="letter" form="short">dopis</term>
-    </terms>
-  </locale>
-  <locale xml:lang="cy">
-    <terms>
-      <term name="letter">cyfathrebu personol</term>
-      <term name="letter" form="short">llythyr</term>
+      <term name="software">computer software</term>
     </terms>
   </locale>
   <locale xml:lang="da">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="de">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persönliche Kommunikation</term>
-      <term name="letter" form="short">Brief</term>
-    </terms>
-  </locale>
-  <locale xml:lang="el">
-    <terms>
-      <term name="letter">προσωπική επικοινωνία</term>
-      <term name="letter" form="short">επιστολή</term>
     </terms>
   </locale>
   <locale xml:lang="es">
     <terms>
       <term name="from">de</term>
-      <term name="letter">comunicación personal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="et">
-    <terms>
-      <term name="letter">isiklik suhtlus</term>
-      <term name="letter" form="short">kiri</term>
-    </terms>
-  </locale>
-  <locale xml:lang="eu">
-    <terms>
-      <term name="letter">komunikazio pertsonala</term>
-      <term name="letter" form="short">gutuna</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fa">
-    <terms>
-      <term name="letter">ارتباط شخصی</term>
-      <term name="letter" form="short">نامه</term>
-    </terms>
-  </locale>
-  <locale xml:lang="fi">
-    <terms>
-      <term name="letter">henkilökohtainen viestintä</term>
-      <term name="letter" form="short">kirje</term>
     </terms>
   </locale>
   <locale xml:lang="fr">
     <terms>
-      <term name="letter">communication personnelle</term>
-      <term name="letter" form="short">lettre</term>
       <term name="editor" form="short">
         <single>éd.</single>
         <multiple>éds.</multiple>
       </term>
     </terms>
   </locale>
-  <locale xml:lang="he">
-    <terms>
-      <term name="letter">תקשורת אישית</term>
-      <term name="letter" form="short">מכתב</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hr">
-    <terms>
-      <term name="letter">osobna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="hu">
-    <terms>
-      <term name="letter">személyes kommunikáció</term>
-      <term name="letter" form="short">levél</term>
-    </terms>
-  </locale>
-  <locale xml:lang="id">
-    <terms>
-      <term name="letter">komunikasi pribadi</term>
-      <term name="letter" form="short">surat</term>
-    </terms>
-  </locale>
-  <locale xml:lang="is">
-    <terms>
-      <term name="letter">persónuleg samskipti</term>
-      <term name="letter" form="short">bréf</term>
-    </terms>
-  </locale>
-  <locale xml:lang="it">
-    <terms>
-      <term name="letter">comunicazione personale</term>
-      <term name="letter" form="short">lettera</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ja">
-    <terms>
-      <term name="letter">個人的なやり取り</term>
-      <term name="letter" form="short">手紙</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ko">
-    <terms>
-      <term name="letter">개인 서신</term>
-      <term name="letter" form="short">편지</term>
-    </terms>
-  </locale>
-  <locale xml:lang="la">
-    <terms>
-      <term name="letter"/>
-      <term name="letter" form="short">epistula</term>
-    </terms>
-  </locale>
-  <locale xml:lang="lt">
-    <terms>
-      <term name="letter">communicationis personalis</term>
-      <term name="letter" form="short"/>
-    </terms>
-  </locale>
-  <locale xml:lang="lv">
-    <terms>
-      <term name="letter">personīga komunikācija</term>
-      <term name="letter" form="short">vēstule</term>
-    </terms>
-  </locale>
-  <locale xml:lang="mn">
-    <terms>
-      <term name="letter">хувийн харилцаа холбоо</term>
-      <term name="letter" form="short">захиа</term>
-    </terms>
-  </locale>
   <locale xml:lang="nb">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
     </terms>
   </locale>
   <locale xml:lang="nl">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">persoonlijke communicatie</term>
-      <term name="letter" form="short">brief</term>
     </terms>
   </locale>
   <locale xml:lang="nn">
     <terms>
       <term name="et-al">et al.</term>
-      <term name="letter">personlig kommunikasjon</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pl">
-    <terms>
-      <term name="letter">osobista komunikacja</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="pt">
-    <terms>
-      <term name="letter">comunicação pessoal</term>
-      <term name="letter" form="short">carta</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ro">
-    <terms>
-      <term name="letter">comunicare personală</term>
-      <term name="letter" form="short">scrisoare</term>
-    </terms>
-  </locale>
-  <locale xml:lang="ru">
-    <terms>
-      <term name="letter">личная переписка</term>
-      <term name="letter" form="short">письмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sk">
-    <terms>
-      <term name="letter">osobná komunikácia</term>
-      <term name="letter" form="short">list</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sl">
-    <terms>
-      <term name="letter">osebna komunikacija</term>
-      <term name="letter" form="short">pismo</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sr">
-    <terms>
-      <term name="letter">лична комуникација</term>
-      <term name="letter" form="short">писмо</term>
-    </terms>
-  </locale>
-  <locale xml:lang="sv">
-    <terms>
-      <term name="letter">personlig kommunikation</term>
-      <term name="letter" form="short">brev</term>
-    </terms>
-  </locale>
-  <locale xml:lang="th">
-    <terms>
-      <term name="letter">การสื่อสารส่วนบุคคล</term>
-      <term name="letter" form="short">จดหมาย</term>
-    </terms>
-  </locale>
-  <locale xml:lang="tr">
-    <terms>
-      <term name="letter">kişisel iletişim</term>
-      <term name="letter" form="short">mektup</term>
-    </terms>
-  </locale>
-  <locale xml:lang="uk">
-    <terms>
-      <term name="letter">особисте спілкування</term>
-      <term name="letter" form="short">лист</term>
-    </terms>
-  </locale>
-  <locale xml:lang="vi">
-    <terms>
-      <term name="letter">giao tiếp cá nhân</term>
-      <term name="letter" form="short">thư</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-CN">
-    <terms>
-      <term name="letter">的私人交流</term>
-      <term name="letter" form="short">信函</term>
-    </terms>
-  </locale>
-  <locale xml:lang="zh-TW">
-    <terms>
-      <term name="letter">私人通訊</term>
-      <term name="letter" form="short">信函</term>
     </terms>
   </locale>
+  <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard -->
+  <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator -->
+  <!-- TODO: New variables:
+         available-date submitted
+         part-number printing-number supplement-number
+         part-title volume-title
+         archive_collection
+         division jurisdiction
+         event-title
+         language
+         license
+         reviewed-genre
+  -->
+  <!-- TODO: New terms:
+         advance-online-publication
+         album on audio-recording
+         original-work-published
+         personal-communication
+         preprint
+         review-of
+         item types
+  -->
+  <!-- TODO: Check Indigeneous Knowledge format -->
   <!-- General categories of item types:
        Periodical: article-journal article-magazine article-newspaper post-weblog review review-book
        Periodical or Booklike: paper-conference
-       Booklike: article book broadcast chapter dataset entry entry-dictionary entry-encyclopedia figure
+       Booklike: article book broadcast chapter classic collection dataset document
+                 entry entry-dictionary entry-encyclopedia event figure
                  graphic interview manuscript map motion_picture musical_score pamphlet patent
-                 personal_communication report song speech thesis post webpage
-       Legal: bill legal_case legislation treaty
+                 performance periodical personal_communication post report
+                 software song speech standard thesis webpage
+       Legal: bill hearing legal_case legislation regulation treaty
   -->
   <!-- APA references contain four parts: author, date, title, source -->
   <macro name="author-bib">
+    <!-- TODO: New creator roles (media, contributor) -->
+    <!-- TODO: Add new item types -->
     <names variable="composer" delimiter=", ">
       <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
       <substitute>
@@ -355,7 +145,7 @@
             </choose>
           </if>
         </choose>
-        <!-- Test for editortranslator and put that first as that becomes available -->
+        <!-- TODO: Test for editortranslator and put that first as that becomes available -->
         <names variable="editor" delimiter=", ">
           <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/>
           <label form="short" prefix=" (" suffix=")" text-case="title"/>
@@ -383,6 +173,8 @@
     </names>
   </macro>
   <macro name="author-intext">
+    <!-- TODO: New creator roles -->
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="bill legal_case legislation treaty" match="any">
         <text macro="title-intext"/>
@@ -399,8 +191,7 @@
                   <text macro="title-intext"/>
                 </substitute>
               </names>
-              <!-- Replace with term="personal-communication" if that becomes available -->
-              <text term="letter"/>
+              <text term="personal-communication"/>
             </group>
           </if>
           <else>
@@ -438,6 +229,7 @@
     </choose>
   </macro>
   <macro name="date-bib">
+    <!-- TODO: Add new item types -->
     <group delimiter=" " prefix="(" suffix=")">
       <choose>
         <if is-uncertain-date="issued">
@@ -476,6 +268,7 @@
           </if>
           <else-if variable="status">
             <group>
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="lowercase"/>
               <text variable="year-suffix" prefix="-"/>
             </group>
@@ -503,6 +296,7 @@
     </choose>
   </macro>
   <macro name="date-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="issued">
         <group delimiter="/">
@@ -550,6 +344,7 @@
         </group>
       </if>
       <else-if variable="status">
+        <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
         <text variable="status" text-case="lowercase"/>
         <text variable="year-suffix" prefix="-"/>
       </else-if>
@@ -579,6 +374,7 @@
     </choose>
   </macro>
   <macro name="title">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="post webpage" match="any">
         <!-- Webpages are always italicized -->
@@ -600,7 +396,7 @@
               <if variable="collection-editor editor editorial-director" match="any">
                 <group delimiter=": " font-style="italic">
                   <text variable="title"/>
-                  <!-- Replace with volume-title as that becomes available -->
+                  <!-- TODO: Replace with volume-title -->
                   <choose>
                     <if is-numeric="volume" match="none">
                       <group delimiter=" ">
@@ -619,7 +415,7 @@
           <else>
             <group delimiter=": " font-style="italic">
               <text variable="title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -635,27 +431,28 @@
     </choose>
   </macro>
   <macro name="title-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="title" match="none">
         <text macro="bracketed-intext" prefix="[" suffix="]"/>
       </if>
+      <else-if type="hearing">
+        <!-- Hearings are italicized -->
+        <text variable="title" form="short" font-style="italic" text-case="title"/>
+      </else-if>
       <else-if type="bill">
-        <!-- If a bill has no number or container-title, assume it is a hearing; italic -->
+        <!-- Bills are not italicized and substitute bill number if no title. -->
         <choose>
-          <if variable="number container-title" match="none">
-            <text variable="title" form="short" font-style="italic" text-case="title"/>
-          </if>
-          <else-if variable="title">
+          <if variable="title">
             <text variable="title" form="short" text-case="title"/>
-          </else-if>
+          </if>
           <else>
             <group delimiter=" ">
               <text variable="genre"/>
               <group delimiter=" ">
                 <choose>
                   <if variable="chapter-number container-title" match="none">
-                    <!-- Replace with label variable="number" as that becomes available -->
-                    <text term="issue" form="short"/>
+                    <label variable="number" form="short"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -686,6 +483,7 @@
     </choose>
   </macro>
   <macro name="parenthetical">
+    <!-- TODO: Add new item types -->
     <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) -->
     <group prefix="(" suffix=")">
       <choose>
@@ -698,13 +496,11 @@
                 <text variable="genre" text-case="capitalize-first"/>
               </if>
               <else>
-                <!-- This should be localized -->
-                <text value="patent" text-case="capitalize-first"/>
+                <text term="patent" text-case="capitalize-first"/>
               </else>
             </choose>
             <group delimiter=" ">
-              <!-- Replace with label variable="number" if that becomes available -->
-              <text term="issue" form="short" text-case="capitalize-first"/>
+              <label variable="number" form="short" text-case="capitalize-first"/>
               <text variable="number"/>
             </group>
           </group>
@@ -741,6 +537,7 @@
     </group>
   </macro>
   <macro name="parenthetical-container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group prefix="(" suffix=")">
@@ -759,6 +556,7 @@
     </choose>
   </macro>
   <macro name="bracketed">
+    <!-- TODO: Add new item types -->
     <!-- [Descriptive information] -->
     <!-- If there is a number, genre is already printed in macro="number" -->
     <group prefix="[" suffix="]">
@@ -779,7 +577,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </else-if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -790,7 +590,9 @@
                         <text variable="medium" text-case="capitalize-first"/>
                       </if>
                       <else>
-                        <!-- Replace with term="review" as that becomes available -->
+                        <!-- TODO: Replace with term="review" -->
+                        <!-- TODO: Handle review vs review-of depending on presence of reviewed-title -->
+                        <!-- TODO: Add reviewed-genre -->
                         <text value="Review of"/>
                       </else>
                     </choose>
@@ -882,7 +684,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </else-if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </if>
@@ -892,7 +694,7 @@
                           <text variable="medium" text-case="capitalize-first"/>
                         </if>
                         <else>
-                          <text term="letter" form="short" text-case="capitalize-first"/>
+                          <text term="letter" text-case="capitalize-first"/>
                         </else>
                       </choose>
                     </else>
@@ -927,20 +729,20 @@
                   <choose>
                     <if variable="genre">
                       <text variable="genre" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else-if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </else-if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -953,13 +755,13 @@
                   <choose>
                     <if variable="medium">
                       <text variable="medium" text-case="capitalize-first"/>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
                     </if>
                     <else>
-                      <!-- Replace prefix with performer label as that becomes available -->
+                      <!-- TODO: Replace prefix with performer label -->
                       <names variable="author" prefix="Recorded by ">
                         <name and="symbol" initialize-with=". " delimiter=", "/>
                       </names>
@@ -993,14 +795,7 @@
                 </if>
               </choose>
             </if>
-            <else-if type="book">
-              <choose>
-                <if variable="version" match="none">
-                  <text macro="format"/>
-                </if>
-              </choose>
-            </else-if>
-            <else-if type="report" match="none">
+            <else-if type="report software" match="none">
               <text macro="format"/>
             </else-if>
           </choose>
@@ -1009,11 +804,14 @@
     </group>
   </macro>
   <macro name="bracketed-intext">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if variable="reviewed-author reviewed-title" type="review review-book" match="any">
-          <!-- This should be localized -->
-          <text macro="reviewed-title-intext" prefix="Review of "/>
+          <group delimiter=" ">
+            <text term="review-of" text-case="capitalize-first"/>
+            <text macro="reviewed-title-intext"/>
+          </group>
         </if>
         <else-if variable="interviewer" type="interview" match="any">
           <names variable="interviewer">
@@ -1034,7 +832,7 @@
                     <text variable="genre" text-case="capitalize-first"/>
                   </if>
                   <else>
-                    <text term="letter" form="short" text-case="capitalize-first"/>
+                    <text term="letter" text-case="capitalize-first"/>
                   </else>
                 </choose>
                 <names variable="recipient" delimiter=", ">
@@ -1055,6 +853,7 @@
     </group>
   </macro>
   <macro name="bracketed-container">
+    <!-- TODO: Add new item types -->
     <group prefix="[" suffix="]">
       <choose>
         <if type="paper-conference speech" match="any">
@@ -1065,7 +864,7 @@
             </if>
           </choose>
         </if>
-        <else-if type="book" variable="version" match="all">
+        <else-if type="software" match="all">
           <!-- For entries in mobile app reference works, place bracketed after the container-title -->
           <text macro="format"/>
         </else-if>
@@ -1077,6 +876,8 @@
     </group>
   </macro>
   <macro name="secondary-contributors">
+    <!-- TODO: Add new item types -->
+    <!-- TODO: Add new creator roles -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <text macro="secondary-contributors-periodical"/>
@@ -1113,6 +914,7 @@
     </group>
   </macro>
   <macro name="secondary-contributors-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if variable="title">
@@ -1122,7 +924,7 @@
           </names>
         </if>
       </choose>
-      <!-- When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
+      <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator -->
       <choose>
         <if type="post webpage" match="none">
           <!-- Webpages treat container-title like publisher -->
@@ -1160,12 +962,13 @@
     <choose>
       <if variable="archive-place" match="none">
         <!-- With `archive-place`: physical archives. Without: online archives. -->
-        <!-- Add archive_collection as that becomes available -->
+        <!-- TODO: Add archive_collection -->
         <text variable="archive_location"/>
       </if>
     </choose>
   </macro>
   <macro name="number">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="number">
         <group delimiter=", ">
@@ -1173,8 +976,7 @@
             <text variable="genre" text-case="title"/>
             <choose>
               <if is-numeric="number">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </if>
               <else>
@@ -1197,6 +999,7 @@
     </choose>
   </macro>
   <macro name="locators-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/>
       <else-if type="paper-conference">
@@ -1223,8 +1026,7 @@
     <choose>
       <if is-numeric="version">
         <group delimiter=" ">
-          <!-- replace with label variable="version" if that becomes available -->
-          <text term="version" text-case="capitalize-first"/>
+          <label variable="version" text-case="capitalize-first"/>
           <text variable="version"/>
         </group>
       </if>
@@ -1247,6 +1049,7 @@
     </choose>
   </macro>
   <macro name="volume-booklike">
+    <!-- TODO: Add new item types -->
     <group delimiter=", ">
       <!-- Report series [ex. 52] -->
       <choose>
@@ -1259,6 +1062,7 @@
       </choose>
       <choose>
         <if variable="volume" match="any">
+          <!-- TODO: Update using volume-title -->
           <choose>
             <!-- Non-numeric volumes are already printed as part of the book title -->
             <if is-numeric="volume" match="none"/>
@@ -1272,8 +1076,7 @@
         </if>
         <else>
           <group>
-            <!-- Replace with label variable="number-of-volumes" if that becomes available -->
-            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <label variable="number-of-volumes" form="short" text-case="capitalize-first" suffix=" "/>
             <text term="page-range-delimiter" prefix="1"/>
             <number variable="number-of-volumes" form="numeric"/>
           </group>
@@ -1315,6 +1118,7 @@
     </choose>
   </macro>
   <macro name="format">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre medium" match="any">
         <group delimiter="; ">
@@ -1327,18 +1131,17 @@
         </group>
       </if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1346,11 +1149,12 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map" text-case="capitalize-first"/>
       </else-if>
     </choose>
   </macro>
   <macro name="format-intext">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="genre" match="any">
         <text variable="genre" text-case="capitalize-first"/>
@@ -1359,18 +1163,17 @@
         <text variable="medium" text-case="capitalize-first"/>
       </else-if>
       <!-- Generic labels for specific types -->
-      <!-- These should be localized when possible -->
+      <!-- TODO: Add terms for other types? -->
       <else-if type="dataset">
-        <text value="Data set"/>
+        <text term="dataset"/>
       </else-if>
-      <else-if type="book" variable="version" match="all">
-        <!-- Replace with type="software" and term="software" as that becomes available -->
-        <text value="Computer software"/>
+      <else-if type="software">
+        <text term="software" text-case="capitalize-first"/>
       </else-if>
       <else-if type="interview personal_communication" match="any">
         <choose>
           <if variable="archive container-title DOI publisher URL" match="none">
-            <text term="letter" text-case="capitalize-first"/>
+            <text term="personal-communication" text-case="capitalize-first"/>
           </if>
           <else-if type="interview">
             <text term="interview" text-case="capitalize-first"/>
@@ -1378,13 +1181,14 @@
         </choose>
       </else-if>
       <else-if type="map">
-        <text value="Map"/>
+        <text term="map"/>
       </else-if>
     </choose>
   </macro>
   <!-- APA 'source' element contains four parts:
        container, event, publisher, access -->
   <macro name="container">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any">
         <!-- Periodical items -->
@@ -1440,6 +1244,7 @@
         <if variable="issued">
           <choose>
             <if variable="issue page volume" match="none">
+              <!-- TODO: Should I print status as-is, or should I print the in-press term? -->
               <text variable="status" text-case="capitalize-first"/>
             </if>
           </choose>
@@ -1448,13 +1253,14 @@
     </group>
   </macro>
   <macro name="container-booklike">
+    <!-- TODO: Add new item types -->
     <choose>
       <if variable="container-title" match="any">
         <group delimiter=" ">
           <text term="in" text-case="capitalize-first"/>
           <group delimiter=", ">
             <names variable="editor translator" delimiter=", &amp; ">
-              <!-- Change to editortranslator and move editor to substitute as that becomes available -->
+              <!-- TODO: Change to editortranslator and move editor to substitute -->
               <name and="symbol" initialize-with=". " delimiter=", "/>
               <label form="short" text-case="title" prefix=" (" suffix=")"/>
               <substitute>
@@ -1465,7 +1271,7 @@
             </names>
             <group delimiter=": " font-style="italic">
               <text variable="container-title"/>
-              <!-- Replace with volume-title as that becomes available -->
+              <!-- TODO: Replace with volume-title -->
               <choose>
                 <if is-numeric="volume" match="none">
                   <group delimiter=" ">
@@ -1483,6 +1289,7 @@
     </choose>
   </macro>
   <macro name="publisher">
+    <!-- TODO: Add new item types -->
     <group delimiter="; ">
       <choose>
         <if type="thesis">
@@ -1517,7 +1324,7 @@
             <!-- With `archive-place`: physical archives. Without: online archives. -->
             <!-- For physical archives, print the location before the archive name.
                 For electronic archives, these are printed in macro="description". -->
-            <!-- Split "archive_location" into "archive_collection" and "archive_location" as that becomes available -->
+            <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" -->
             <!-- Must test for archive_collection:
                 With collection: archive_collection (archive_location), archive, archive-place
                 No collection: archive (archive_location), archive-place
@@ -1552,6 +1359,7 @@
     </choose>
   </macro>
   <macro name="event">
+    <!-- TODO: Add new item types (e.g., event, collection, performance) -->
     <choose>
       <if variable="event event-title" match="any">
         <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to
@@ -1584,6 +1392,7 @@
   </macro>
   <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) -->
   <macro name="publication-history">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="patent" match="none">
         <group prefix="(" suffix=")">
@@ -1595,6 +1404,7 @@
               <text variable="references"/>
             </if>
             <else>
+              <!-- TODO: Replace these with terms -->
               <group delimiter=" ">
                 <text term="original-work-published" text-case="capitalize-first"/>
                 <choose>
@@ -1617,86 +1427,60 @@
   </macro>
   <!-- Legal citations have their own rules -->
   <macro name="legal-cites">
+    <!-- TODO: Add new item types -->
     <choose>
-      <if type="legal_case">
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-            </group>
-            <text variable="references"/>
-          </group>
+      <if type="treaty">
+        <!-- APA generally defers to Bluebook for legal citations, but diverges without
+             explanation for treaty items. The Bluebook format that was used in APA 6th
+             ed. is used here. -->
+        <group delimiter=", ">
+          <text variable="title" text-case="title"/>
+          <names variable="author">
+            <name initialize-with="." form="short" delimiter="-"/>
+          </names>
+          <text macro="date-legal"/>
+          <text macro="container-legal"/>
           <text macro="access"/>
         </group>
       </if>
-      <else-if type="bill">
-        <!-- Currently designed to handle bills, resolutions, hearings, rederal reports. -->
+      <else>
+        <!-- For `bill`: currently designed to handle bills, resolutions, federal reports. -->
+        <!-- For `legislation`: currently designed to handle statutes, codified regulations, executive orders. -->
         <group delimiter=". ">
           <group delimiter=", ">
             <choose>
-              <if variable="number container-title" match="none">
-                <!-- If no number or container-title, then assume it is a hearing -->
-                <text variable="title" font-style="italic"/>
-              </if>
-              <else>
+              <if type="bill legal_case legislation" match="any">
                 <text variable="title"/>
-              </else>
+              </if>
+              <else-if type="hearing">
+                <text variable="title" font-style="italic"/>
+              </else-if>
             </choose>
             <group delimiter=" ">
               <text macro="container-legal"/>
               <text macro="date-legal"/>
               <choose>
-                <if variable="number container-title" match="none">
-                  <!-- If no number or container-title, then assume it is a hearing -->
+                <if type="hearing">
                   <names variable="author" prefix="(testimony of " suffix=")">
+                    <!-- TODO: Localize this with the hearing term. -->
                     <name and="symbol" delimiter=", "/>
                   </names>
                 </if>
-                <else>
+                <else-if type="bill legislation" match="any">
+                  <!-- `legislation`: For uncodified regulations, assume future code section is in status. -->
                   <text variable="status" prefix="(" suffix=")"/>
-                </else>
+                </else-if>
               </choose>
             </group>
             <text variable="references"/>
           </group>
           <text macro="access"/>
         </group>
-      </else-if>
-      <else-if type="legislation">
-        <!-- Currently designed to handle statutes, codified regulations, executive orders.
-             For uncodified regulations, assume future code section is in status. -->
-        <group delimiter=". ">
-          <group delimiter=", ">
-            <text variable="title"/>
-            <group delimiter=" ">
-              <text macro="container-legal"/>
-              <text macro="date-legal"/>
-              <text variable="status" prefix="(" suffix=")"/>
-            </group>
-            <text variable="references"/>
-          </group>
-          <text macro="access"/>
-        </group>
-      </else-if>
-      <else-if type="treaty">
-        <!-- APA generally defers to Bluebook for legal citations, but diverges without
-             explanation for treaty items. The Bluebook format that was used in APA 6th
-             ed. is used here. -->
-        <group delimiter=", ">
-          <text variable="title" text-case="title"/>
-          <names variable="author">
-            <name initialize-with="." form="short" delimiter="-"/>
-          </names>
-          <text macro="date-legal"/>
-          <text macro="container-legal"/>
-          <text macro="access"/>
-        </group>
-      </else-if>
+      </else>
     </choose>
   </macro>
   <macro name="date-legal">
+    <!-- TODO: Add new item types -->
     <choose>
       <if type="legal_case">
         <group prefix="(" suffix=")" delimiter=" ">
@@ -1712,7 +1496,7 @@
           </choose>
         </group>
       </if>
-      <else-if type="bill legislation" match="any">
+      <else-if type="bill legislation hearing" match="any">
         <group prefix="(" suffix=")" delimiter=" ">
           <group delimiter=" ">
             <date variable="original-date">
@@ -1731,6 +1515,7 @@
     </choose>
   </macro>
   <macro name="container-legal">
+    <!-- TODO: Add new item types -->
     <!-- Expect legal item container-titles to be stored in short form -->
     <choose>
       <if type="legal_case">
@@ -1741,8 +1526,7 @@
                 <text variable="volume"/>
                 <text variable="container-title"/>
                 <group delimiter=" ">
-                  <!-- Change to label variable="section" as that becomes available -->
-                  <text term="section" form="symbol"/>
+                  <label variable="section" form="symbol"/>
                   <text variable="section"/>
                 </group>
                 <choose>
@@ -1759,8 +1543,7 @@
               <group delimiter=" ">
                 <choose>
                   <if is-numeric="number">
-                    <!-- Replace with label variable="number" if that becomes available -->
-                    <text term="issue" form="short" text-case="capitalize-first"/>
+                    <label variable="number" form="short" text-case="capitalize-first"/>
                   </if>
                 </choose>
                 <text variable="number"/>
@@ -1776,8 +1559,7 @@
             <group delimiter=" ">
               <choose>
                 <if variable="chapter-number container-title" match="none">
-                  <!-- Replace with label variable="number" as that becomes available -->
-                  <text term="issue" form="short"/>
+                  <label variable="number" form="short"/>
                 </if>
               </choose>
               <text variable="number"/>
@@ -1812,7 +1594,7 @@
               <choose>
                 <if variable="section">
                   <group delimiter=" ">
-                    <!-- Change to label variable="section" as that becomes available -->
+                    <!-- TODO: Change to label variable="section" -->
                     <text term="section" form="symbol"/>
                     <text variable="section"/>
                   </group>
@@ -1835,8 +1617,7 @@
             </if>
             <else>
               <group delimiter=" ">
-                <!-- Replace with label variable="number" if that becomes available -->
-                <text term="issue" form="short" text-case="capitalize-first"/>
+                <label variable="number" form="short" text-case="capitalize-first"/>
                 <text variable="number"/>
               </group>
             </else>
@@ -1846,6 +1627,7 @@
     </choose>
   </macro>
   <macro name="citation-locator">
+    <!-- TODO: Add new locator types? -->
     <group delimiter=" ">
       <choose>
         <if locator="chapter">
@@ -1883,6 +1665,7 @@
     </sort>
     <layout>
       <choose>
+        <!-- TODO: Add new item types -->
         <if type="bill legal_case legislation treaty" match="any">
           <!-- Legal items have different orders and delimiters -->
           <choose>
diff --git a/src/main/resources/journals/journal-list.mv b/src/main/resources/journals/journal-list.mv
index 00f97a02305..8a6b27174c9 100644
Binary files a/src/main/resources/journals/journal-list.mv and b/src/main/resources/journals/journal-list.mv differ