diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000000..498a52431af
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,38 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/java
+{
+    "name": "Java",
+    "image": "mcr.microsoft.com/vscode/devcontainers/base:bullseye",
+
+    // Configure tool-specific properties.
+    "customizations": {
+        // Configure properties specific to VS Code.
+        "vscode": {
+            // Set *default* container specific settings.json values on container create.
+            "settings": { 
+            },
+            
+            // Add the IDs of extensions you want installed when the container is created.
+            "extensions": [
+                "vscjava.vscode-java-pack"
+            ]
+        }
+    },
+
+    "onCreateCommand": "gradle assemble",
+
+    // Need to connect as root otherwise we run into issues with gradle.
+    // default option is "vscode". More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "root",
+    "features": {
+        // Adds a lightweight desktop that can be accessed using a VNC viewer or the web
+        "desktop-lite": "latest",
+
+        // Install java
+        "java": {
+            "version": "18",
+            "installGradle": true,
+            "jdkDistro": "sem"
+        }
+    }
+}
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 9783e2a9aaa..807af23a0ae 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - name: 'Wait for status checks'
         id: waitforstatuschecks
-        uses: "WyriHaximus/github-action-wait-for-status@v1.6"
+        uses: "WyriHaximus/github-action-wait-for-status@v1.7.1"
         with:
           ignoreActions: Automerge Dependabot,Code coverage,Create snapcraft image,Deploy binaries on builds.jabref.org,codecov/project,markdown-link-check
           checkInterval: 13
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 121fb51d795..de3c8f2b508 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -130,7 +130,7 @@ jobs:
           get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
           get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
       - name: Upload to GitHub workflow artifacts store
-        uses: actions/upload-artifact@master
+        uses: actions/upload-artifact@v3
         with:
           name: JabRef-${{ matrix.displayName }}
           path: build/distribution
diff --git a/.github/workflows/gource.yml b/.github/workflows/gource.yml
index 253ef9702a8..48c9e55d1e7 100644
--- a/.github/workflows/gource.yml
+++ b/.github/workflows/gource.yml
@@ -49,7 +49,7 @@ jobs:
         run: |
           mv gource/gource.mp4 gource-videos/jabref-complete.mp4
       - name: 'Upload gource video'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Gource
           path: ./gource-videos/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e4cfe3ac8a..09770b0aa12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Changed
 
+- Genres are now mapped correctly to entry types when importing MODS files. [#9185](https://github.com/JabRef/jabref/issues/9185)
 - We improved the Citavi Importer to also import so called Knowledge-items into the field `comment` of the corresponding entry [#9025](https://github.com/JabRef/jabref/issues/9025)
 - We removed wrapping of string constants when writing to a `.bib` file.
 - We call backup files `.bak` and temporary writing files now `.sav`.
@@ -33,10 +34,11 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - The global default directory for storing PDFs is now the subdirectory "JabRef" in the user's home.
 - We reworked the Define study parameters dialog. [#9123](https://github.com/JabRef/jabref/pull/9123)
 - We simplified the actions to fast-resolve duplicates to 'Keep Left', 'Keep Right', 'Keep Both' and 'Keep Merged'. [#9056](https://github.com/JabRef/jabref/issues/9056)
-
+- We fixed an issue where a message about changed metadata would occur on saving although nothing changed. [#9159](https://github.com/JabRef/jabref/issues/9159)
 
 ### Fixed
 
+- We fixed the display of the "Customize Entry Types" dialogue title [#9198](https://github.com/JabRef/jabref/issues/9198)
 - We fixed an issue where author names with tilde accents (for example ñ) were marked as "Names are not in the standard BibTex format" [#8071](https://github.com/JabRef/jabref/issues/8071)
 - We fixed an issue where the possibility to generate a subdatabase from an aux file was writing empty files when called from the commandline [#9115](https://github.com/JabRef/jabref/issues/9115), [forum#3516](https://discourse.jabref.org/t/export-subdatabase-from-aux-file-on-macos-command-line/3516)
 - We fixed the display of issue, number, eid and pages fields in the entry preview. [#8607](https://github.com/JabRef/jabref/pull/8607), [#8372](https://github.com/JabRef/jabref/issues/8372), [Koppor#514](https://github.com/koppor/jabref/issues/514), [forum#2390](https://discourse.jabref.org/t/unable-to-edit-my-bibtex-file-that-i-used-before-vers-5-1/2390), [forum#3462](https://discourse.jabref.org/t/jabref-5-6-need-help-with-export-from-jabref-to-microsoft-word-entry-preview-of-apa-7-not-rendering-correctly/3462)
@@ -52,6 +54,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where JabRef would not exit when a connection to a LibreOffice document was established previously and the document is still open. [#9075](https://github.com/JabRef/jabref/issues/9075)
 - We fixed an issue about selecting the save order in the preferences. [#9175](https://github.com/JabRef/jabref/issues/9147)
 - We fixed an issue where the CSS styles are missing in some dialogs. [#9150](https://github.com/JabRef/jabref/pull/9150)
+- We fixed an issue where pdfs were re-indexed on each startup. [#9166](https://github.com/JabRef/jabref/pull/9166)
+- We fixed an issue where Capitalize didn't capitalize words after hyphen characters. [#9157](https://github.com/JabRef/jabref/issues/9157)
 
 ### Removed
 
diff --git a/build.gradle b/build.gradle
index 659d362f4ba..7c4576b1e1b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -132,8 +132,8 @@ dependencies {
 
     implementation 'commons-cli:commons-cli:1.5.0'
 
-    implementation 'org.libreoffice:libreoffice:7.4.0'
-    implementation 'org.libreoffice:unoloader:7.4.0'
+    implementation 'org.libreoffice:libreoffice:7.4.1'
+    implementation 'org.libreoffice:unoloader:7.4.1'
 
     implementation 'io.github.java-diff-utils:java-diff-utils:4.12'
     implementation 'info.debatty:java-string-similarity:2.0.0'
@@ -160,9 +160,11 @@ dependencies {
         exclude module: "jsr305"
     }
 
-    implementation group: 'jakarta.annotation', name: 'jakarta.annotation-api', version: '1.3.5'
+    implementation 'jakarta.annotation:jakarta.annotation-api:2.1.1'
+    implementation 'jakarta.inject:jakarta.inject-api:2.0.1'
 
-    // JavaFX stuff
+
+    implementation 'com.github.JabRef:afterburner.fx:testmoduleinfo-SNAPSHOT'
     implementation 'org.kordamp.ikonli:ikonli-javafx:12.3.1'
     implementation 'org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1'
     implementation 'com.github.sialcasa.mvvmFX:mvvmfx-validation:f195849ca9' //jitpack
@@ -170,14 +172,13 @@ dependencies {
     implementation 'com.tobiasdiez:easybind:2.2.1-SNAPSHOT'
     implementation 'org.fxmisc.flowless:flowless:0.6.10'
     implementation 'org.fxmisc.richtext:richtextfx:0.10.9'
-    implementation group: 'org.glassfish.hk2.external', name: 'jakarta.inject', version: '2.6.1'
     implementation 'com.jfoenix:jfoenix:9.0.10'
     implementation 'org.controlsfx:controlsfx:11.1.1'
 
     implementation 'org.jsoup:jsoup:1.15.3'
     implementation 'com.konghq:unirest-java:3.13.11'
 
-    implementation 'org.slf4j:slf4j-api:2.0.0'
+    implementation 'org.slf4j:slf4j-api:2.0.3'
     implementation "org.tinylog:tinylog-api:2.5.0"
     implementation "org.tinylog:slf4j-tinylog:2.5.0"
     implementation "org.tinylog:tinylog-impl:2.5.0"
@@ -204,8 +205,8 @@ dependencies {
     implementation group: 'net.harawata', name: 'appdirs', version: '1.2.1'
 
     testImplementation 'io.github.classgraph:classgraph:4.8.149'
-    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.0'
-    testImplementation 'org.junit.platform:junit-platform-launcher:1.9.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter:5.9.1'
+    testImplementation 'org.junit.platform:junit-platform-launcher:1.9.1'
 
     testImplementation 'org.mockito:mockito-core:4.8.0'
     testImplementation 'org.xmlunit:xmlunit-core:2.9.0'
@@ -216,7 +217,7 @@ dependencies {
     testImplementation "org.testfx:testfx-junit5:4.0.16-alpha"
     testImplementation "org.hamcrest:hamcrest-library:2.2"
 
-    checkstyle 'com.puppycrawl.tools:checkstyle:10.3.3'
+    checkstyle 'com.puppycrawl.tools:checkstyle:10.3.4'
     // xjc needs the runtime as well for the ant task, otherwise it fails
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-xjc', version: '3.0.2'
     xjc group: 'org.glassfish.jaxb', name: 'jaxb-runtime', version: '3.0.2'
@@ -560,7 +561,6 @@ jlink {
         requires 'java.transaction.xa'
         requires 'java.rmi'
         requires 'java.xml'
-        requires 'jdk.jfr'
         requires 'jdk.jsobject'
         requires 'jdk.unsupported'
         requires 'jdk.unsupported.desktop'
@@ -569,8 +569,6 @@ jlink {
         requires 'com.google.gson'
         requires 'org.slf4j'
         requires 'jakarta.xml.bind'
-        uses 'com.airhacks.afterburner.views.ResourceLocator'
-        uses 'com.airhacks.afterburner.injection.PresenterFactory'
         uses 'org.mariadb.jdbc.credential.CredentialPlugin'
         uses 'org.mariadb.jdbc.authentication.AuthenticationPlugin'
         uses 'org.mariadb.jdbc.tls.TlsSocketPlugin'
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index a8c68783372..3e9f9aa812c 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -8,7 +8,7 @@ repositories {
 dependencies {
     implementation 'com.h2database:h2-mvstore:2.1.214'
     implementation 'org.apache.commons:commons-csv:1.9.0'
-    implementation 'org.slf4j:slf4j-api:2.0.0'
+    implementation 'org.slf4j:slf4j-api:2.0.3'
 }
 
 sourceSets{
diff --git a/buildres/csl/csl-locales/.github/workflows/label-gun.yml b/buildres/csl/csl-locales/.github/workflows/label-gun.yml
index d4d022673f8..c87c1721b75 100644
--- a/buildres/csl/csl-locales/.github/workflows/label-gun.yml
+++ b/buildres/csl/csl-locales/.github/workflows/label-gun.yml
@@ -6,8 +6,13 @@ on:
   issue_comment:
     types: [created, edited, closed]
 
+permissions: {}
 jobs:
   label:
+    permissions:
+      issues: write # to add label to an issues (retorquere/label-gun)
+      pull-requests: write # to add label, comment on pull request (retorquere/label-gun)
+
     runs-on: ubuntu-latest
     steps:
       - uses: retorquere/label-gun@main
diff --git a/buildres/csl/csl-locales/.github/workflows/merge.yaml b/buildres/csl/csl-locales/.github/workflows/merge.yaml
index f52a6ba4110..c1efb7eab07 100644
--- a/buildres/csl/csl-locales/.github/workflows/merge.yaml
+++ b/buildres/csl/csl-locales/.github/workflows/merge.yaml
@@ -12,8 +12,13 @@ on:
         description: Commit message
         required: true
 
+permissions: {}
 jobs:
   release:
+    permissions:
+      contents: write # to create a release
+      pull-requests: read # to read pull requests (dorny/paths-filter)
+
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/buildres/csl/csl-locales/.github/workflows/sheldon.yaml b/buildres/csl/csl-locales/.github/workflows/sheldon.yaml
index 9bf525949f1..42962c95090 100644
--- a/buildres/csl/csl-locales/.github/workflows/sheldon.yaml
+++ b/buildres/csl/csl-locales/.github/workflows/sheldon.yaml
@@ -4,8 +4,13 @@ on:
   pull_request_target:
     types: [ opened, synchronize, workflow_dispatch]
 
+permissions: {}
 jobs:
   test:
+    permissions:
+      contents: write # to push code in repo (stefanzweifel/git-auto-commit-action)
+      pull-requests: write # to comment on pull requests
+
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/buildres/csl/csl-locales/locales-it-IT.xml b/buildres/csl/csl-locales/locales-it-IT.xml
index d01bf61c208..2822e365c30 100644
--- a/buildres/csl/csl-locales/locales-it-IT.xml
+++ b/buildres/csl/csl-locales/locales-it-IT.xml
@@ -2,13 +2,11 @@
 <locale xmlns="http://purl.org/net/xbiblio/csl" version="1.0" xml:lang="it-IT">
   <info>
     <translator>
-      <name>FI App Development</name>
-    </translator>
-    <translator>
-      <name>Monica Thuegaz</name>
+      <name>Filippo Vomiero</name>
+      <email>filippo.vomiero@unipd.it</email>
     </translator>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
-    <updated>2012-07-04T23:31:02+00:00</updated>
+    <updated>2022-07-07T17:56:02+01:00</updated>
   </info>
   <style-options punctuation-in-quote="false"/>
   <date form="text">
@@ -24,31 +22,31 @@
   <terms>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
+    <term name="audio-recording">registrazione audio</term>
     <term name="film">film</term>
-    <term name="henceforth">henceforth</term>
+    <term name="henceforth">d'ora in poi</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
+    <term name="no-place">sine loco</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher">sine nomine</term> <!-- sine nomine -->
+    <term name="no-publisher" form="short">s.n.</term>
+    <term name="on">su</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
+    <term name="original-work-published">opera originale pubblicata</term>
     <term name="personal-communication">comunicazione personale</term>
     <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
+    <term name="podcast-episode">episodio di podcast</term>
     <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
-    <term name="radio-series-episode">radio series episode</term>
-    <term name="special-issue">special issue</term>
-    <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
-    <term name="television-series">television series</term>
-    <term name="television-series-episode">television series episode</term>
+    <term name="radio-broadcast">trasmissione radiofonica</term>
+    <term name="radio-series">serie radiofonica</term>
+    <term name="radio-series-episode">episodio di serie radiofonica</term>
+    <term name="special-issue">edizione speciale</term>
+    <term name="special-section">sezione speciale</term>
+    <term name="television-broadcast">trasmissione televisiva</term>
+    <term name="television-series">serie televisiva</term>
+    <term name="television-series-episode">episodio di serie televisiva</term>
     <term name="video">video</term>
-    <term name="working-paper">working paper</term>
+    <term name="working-paper">documento di lavoro</term>
     <term name="accessed">consultato</term>
     <term name="and">e</term>
     <term name="and others">e altri</term>
@@ -77,17 +75,17 @@
     <term name="internet">internet</term>
     <term name="interview">intervista</term>
     <term name="letter">lettera</term>
-    <term name="no date">senza data</term>
+    <term name="no date">sine data</term>
     <term name="no date" form="short">s.d.</term>
     <term name="online">online</term>
     <term name="presented at">presentato al</term>
     <term name="reference">
-      <single>reference</single>
-      <multiple>references</multiple>
+      <single>riferimento</single>
+      <multiple>riferimenti</multiple>
     </term>
     <term name="reference" form="short">
-      <single>ref.</single>
-      <multiple>refs.</multiple>
+      <single>rif.</single>
+      <multiple>rif.</multiple>
     </term>
     <term name="retrieved">recuperato</term>
     <term name="scale">scala</term>
@@ -95,67 +93,67 @@
 
     <!-- LONG ITEM TYPE FORMS -->
     <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
-    <term name="bill">bill</term>
-    <term name="book">book</term>
+    <term name="article-journal">articolo di rivista</term>
+    <term name="article-magazine">articolo di rivista generalista</term>
+    <term name="article-newspaper">articolo di giornale</term>
+    <term name="bill">proposta di legge</term>
+    <term name="book">libro</term>
     <term name="broadcast">broadcast</term>
-    <term name="chapter">book chapter</term>
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="chapter">capitolo di libro</term>
+    <term name="classic">classico</term>
+    <term name="collection">collezione</term>
     <term name="dataset">dataset</term>
-    <term name="document">document</term>
-    <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="document">documento</term>
+    <term name="entry">voce</term>
+    <term name="entry-dictionary">voce di dizionario</term>
+    <term name="entry-encyclopedia">voce di enciclopedia</term>
+    <term name="event">evento</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
-    <term name="interview">interview</term>
-    <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
-    <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
-    <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
-    <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="graphic">opera d'arte</term>
+    <term name="hearing">udienza</term>
+    <term name="interview">intervista</term>
+    <term name="legal_case">causa</term>
+    <term name="legislation">legislazione</term>
+    <term name="manuscript">manoscritto</term>
+    <term name="map">mappa</term>
+    <term name="motion_picture">film</term>
+    <term name="musical_score">spartito musicale</term>
+    <term name="pamphlet">opuscolo</term>
+    <term name="paper-conference">atto di convegno</term>
+    <term name="patent">brevetto</term>
+    <term name="performance">esecuzione</term>
+    <term name="periodical">periodico</term>
     <term name="personal_communication">comunicazione personale</term>
-    <term name="post">post</term>
-    <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
+    <term name="post">messaggio</term>
+    <term name="post-weblog">messaggio di blog</term>
+    <term name="regulation">decreto</term>
     <term name="report">report</term>
     <term name="review">review</term>
-    <term name="review-book">book review</term>
+    <term name="review-book">recensione di libro</term>
     <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
-    <term name="webpage">webpage</term>
+    <term name="song">registrazione audio</term>
+    <term name="speech">presentazione</term>
+    <term name="standard">norma</term>
+    <term name="thesis">tesi</term>
+    <term name="treaty">trattato</term>
+    <term name="webpage">pagina web</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
-    <term name="article-journal" form="short">journal art.</term>
-    <term name="article-magazine" form="short">mag. art.</term>
-    <term name="article-newspaper" form="short">newspaper art.</term>
-    <term name="book" form="short">bk.</term>
-    <term name="chapter" form="short">bk. chap.</term>
+    <term name="article-journal" form="short">art. di riv.</term>
+    <term name="article-magazine" form="short">art. di riv</term>
+    <term name="article-newspaper" form="short">art. di g.</term>
+    <term name="book" form="short">l.</term>
+    <term name="chapter" form="short">c. di l.</term>
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
+    <term name="graphic" form="short">op. d'arte</term>
     <term name="interview" form="short">interv.</term>
-    <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
+    <term name="manuscript" form="short">ms.</term>
+    <term name="motion_picture" form="short">film</term>
     <term name="report" form="short">rep.</term>
     <term name="review" form="short">rev.</term>
-    <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="review-book" form="short">rec. di l.</term>
+    <term name="song" form="short">reg. audio</term>
 
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">d.C.</term>
@@ -212,48 +210,48 @@
 
     <!-- LONG LOCATOR FORMS -->
     <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
+      <single>atto</single>
+      <multiple>atto</multiple>						 
     </term>
     <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <single>appendice</single>
+      <multiple>appendici</multiple>						 
     </term>
     <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
+      <single>articolo</single>
+      <multiple>articoli</multiple>						 
     </term>
     <term name="canon">			 
-      <single>canon</single>
-      <multiple>canons</multiple>						 
+      <single>canone</single>
+      <multiple>canoni</multiple>						 
     </term>
     <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
+      <single>indirizzo</single>
+      <multiple>indirizzi</multiple>						 
     </term>
     <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
+      <single>equazione</single>
+      <multiple>equazioni</multiple>						 
     </term>
     <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
+      <single>regola</single>
+      <multiple>regole</multiple>						 
     </term>
     <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
+      <single>scena</single>
+      <multiple>scene</multiple>						 
     </term>
     <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+      <single>tavola</single>
+      <multiple>tavole</multiple>						 
     </term>
     <term name="timestamp"> <!-- generally blank -->
       <single></single>
       <multiple></multiple>						 
     </term>
     <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <single>titolo</single>
+      <multiple>titoli</multiple>						 
     </term>
     <term name="book">
       <single>libro</single>
@@ -276,8 +274,8 @@
       <multiple>fogli</multiple>
     </term>
     <term name="issue" gender="masculine">
-      <single>numero</single>
-      <multiple>numeri</multiple>
+      <single>fascicolo</single>
+      <multiple>fascicoli</multiple>
     </term>
     <term name="line">
       <single>riga</single>
@@ -300,16 +298,16 @@
       <multiple>pagine</multiple>
     </term>
     <term name="paragraph">
-      <single>capoverso</single>
-      <multiple>capoversi</multiple>
+      <single>paragrafo</single>
+      <multiple>paragrafi</multiple>
     </term>
     <term name="part">
       <single>parte</single>
       <multiple>parti</multiple>
     </term>
     <term name="section">
-      <single>paragrafo</single>
-      <multiple>paragrafi</multiple>
+      <single>sezione</single>
+      <multiple>sezioni</multiple>
     </term>
     <term name="sub-verbo">
       <single>sub verbo</single>
@@ -327,11 +325,11 @@
     <!-- SHORT LOCATOR FORMS -->
     <term name="appendix">			 
       <single>app.</single>
-      <multiple>apps.</multiple>						 
+      <multiple>app.</multiple>						 
     </term>
     <term name="article-locator">			 
       <single>art.</single>
-      <multiple>arts.</multiple>
+      <multiple>art.</multiple>
     </term>
     <term name="elocation">			 
       <single>loc.</single>
@@ -339,19 +337,19 @@
     </term>
     <term name="equation">			 
       <single>eq.</single>
-      <multiple>eqs.</multiple>
+      <multiple>eq.</multiple>
     </term>
     <term name="rule">			 
       <single>r.</single>
-      <multiple>rr.</multiple>						 
+      <multiple>r.</multiple>						 
     </term>
     <term name="scene">			 
       <single>sc.</single>
-      <multiple>scs.</multiple>						 
+      <multiple>sc.</multiple>						 
     </term>
     <term name="table">			 
-      <single>tbl.</single>
-      <multiple>tbls.</multiple>						 
+      <single>tab.</single>
+      <multiple>tab.</multiple>						 
     </term>
     <term name="timestamp"> <!-- generally blank -->
       <single></single>
@@ -369,21 +367,21 @@
     <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">fgl.</term>
-    <term name="issue" form="short">n.</term>
-    <term name="line" form="short">l.</term>
+    <term name="issue" form="short">fasc.</term>
+    <term name="line" form="short">r.</term>
     <term name="note" form="short">n.</term>
     <term name="opus" form="short">op.</term>
     <term name="page" form="short">
-      <single>pag.</single>
-      <multiple>pagg.</multiple>
+      <single>p.</single>
+      <multiple>pp.</multiple>
     </term>
     <term name="number-of-pages" form="short">
-      <single>pag.</single>
-      <multiple>pagg.</multiple>
+      <single>p.</single>
+      <multiple>pp.</multiple>
     </term>
-    <term name="paragraph" form="short">cpv.</term>
+    <term name="paragraph" form="short">par.</term>
     <term name="part" form="short">pt.</term>
-    <term name="section" form="short">par.</term>
+    <term name="section" form="short">sez.</term>
     <term name="sub-verbo" form="short">
       <single>s.v.</single>
       <multiple>s.vv.</multiple>
@@ -409,68 +407,68 @@
 
     <!-- LONG ROLE FORMS -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>presidente</single>
+      <multiple>presidenti</multiple>
     </term>
     <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+      <single>compilatore</single>
+      <multiple>compilatori</multiple>
     </term>
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>collaboratore</single>
+      <multiple>collaboratori</multiple>
     </term>
     <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+      <single>curatore</single>
+      <multiple>curatori</multiple>
     </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>produttore esecutivo</single>
+      <multiple>produttori esecutivi</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>ospite</single>
+      <multiple>ospiti</multiple>
     </term>
     <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+      <single>conduttore</single>
+      <multiple>conduttori</multiple>
     </term>
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>narratore</single>
+      <multiple>narratori</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organizzatore</single>
+      <multiple>organizzatori</multiple>
     </term>
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>esecutore</single>
+      <multiple>esecutori</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>produttore</single>
+      <multiple>produttori</multiple>
     </term>
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>sceneggiatore</single>
+      <multiple>sceneggiatori</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+      <single>autore della serie</single>
+      <multiple>autori della serie</multiple>
     </term>
     <term name="director">
-      <single>director</single>
-      <multiple>directors</multiple>
+      <single>regista</single>
+      <multiple>registi</multiple>
     </term>
     <term name="editor">
       <single>curatore</single>
       <multiple>curatori</multiple>
     </term>
     <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editors</multiple>
+      <single>direttore editoriale</single>
+      <multiple>direttori editoriali</multiple>
     </term>
     <term name="illustrator">
       <single>illustratore</single>
@@ -488,55 +486,55 @@
     <!-- SHORT ROLE FORMS -->
     <term name="compiler" form="short">
       <single>comp.</single>
-      <multiple>comps.</multiple>
+      <multiple>comp.</multiple>
     </term>
     <term name="contributor" form="short">
-      <single>contrib.</single>
-      <multiple>contribs.</multiple>
+      <single>collab.</single>
+      <multiple>collab.</multiple>
     </term>
     <term name="curator" form="short">
       <single>cur.</single>
-      <multiple>curs.</multiple>
+      <multiple>cur.</multiple>
     </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>prod.es.</single>
+      <multiple>prod. es.</multiple>
     </term>
     <term name="narrator" form="short">
       <single>narr.</single>
-      <multiple>narrs.</multiple>
+      <multiple>narr.</multiple>
     </term>
     <term name="organizer" form="short">
       <single>org.</single>
-      <multiple>orgs.</multiple>
+      <multiple>org.</multiple>
     </term>
     <term name="performer" form="short">
-      <single>perf.</single>
-      <multiple>perfs.</multiple>
+      <single>esec.</single>
+      <multiple>esec.</multiple>
     </term>
     <term name="producer" form="short">
       <single>prod.</single>
-      <multiple>prods.</multiple>
+      <multiple>prod.</multiple>
     </term>
     <term name="script-writer" form="short">
-      <single>writ.</single>
-      <multiple>writs.</multiple>
+      <single>scen.</single>
+      <multiple>scen.</multiple>
     </term>
     <term name="series-creator" form="short">
-      <single>cre.</single>
-      <multiple>cres.</multiple>
+      <single>aut. d. serie</single>
+      <multiple>aut. d. serie</multiple>
     </term>
     <term name="director" form="short">
-      <single>dir.</single>
-      <multiple>dir.</multiple>
+      <single>reg.</single>
+      <multiple>reg.</multiple>
     </term>
     <term name="editor" form="short">
       <single>a c. di</single>
       <multiple>a c. di</multiple>
     </term>
     <term name="editorial-director" form="short">
-      <single>ed.</single>
-      <multiple>ed.</multiple>
+      <single>dir. ed.</single>
+      <multiple>dir. ed.</multiple>
     </term>
     <term name="illustrator" form="short">
       <single>ill.</single>
@@ -547,28 +545,28 @@
       <multiple>trad.</multiple>
     </term>
     <term name="editortranslator" form="short">
-      <single>a c. di e trad. da</single>
-      <multiple>a c. di e trad. da</multiple>
+      <single>cur. e trad.</single>
+      <multiple>cur. e trad.</multiple>
     </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
-    <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
-    <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="chair" form="verb">presieduto da</term>
+    <term name="compiler" form="verb">compilato da</term>
+    <term name="contributor" form="verb">con un contributo di</term>
+    <term name="curator" form="verb">a cura di</term>
+    <term name="executive-producer" form="verb">produzione esecutiva di</term>
+    <term name="guest" form="verb">con ospite</term>
+    <term name="host" form="verb">condotto da</term>
+    <term name="narrator" form="verb">narrato da</term>
+    <term name="organizer" form="verb">organizzato da</term>
+    <term name="performer" form="verb">esecuzione di</term>
+    <term name="producer" form="verb">prodotto da</term>
+    <term name="script-writer" form="verb">scritto da</term>
+    <term name="series-creator" form="verb">creato da</term>
     <term name="container-author" form="verb">di</term>
     <term name="director" form="verb">diretto da</term>
     <term name="editor" form="verb">a cura di</term>
-    <term name="editorial-director" form="verb">edited by</term>
+    <term name="editorial-director" form="verb">direzione editoriale di</term>
     <term name="illustrator" form="verb">illustrato da</term>
     <term name="interviewer" form="verb">intervista di</term>
     <term name="recipient" form="verb">a</term>
@@ -577,21 +575,21 @@
     <term name="editortranslator" form="verb">a cura di e tradotto da</term>
 
     <!-- SHORT VERB ROLE FORMS -->
-    <term name="compiler" form="verb-short">comp. by</term>
-    <term name="contributor" form="verb-short">w.</term>
-    <term name="curator" form="verb-short">cur. by</term>
-    <term name="executive-producer" form="verb-short">exec. prod. by</term>
-    <term name="guest" form="verb-short">w. guest</term>
-    <term name="host" form="verb-short">hosted by</term>
-    <term name="narrator" form="verb-short">narr. by</term>
-    <term name="organizer" form="verb-short">org. by</term>
-    <term name="performer" form="verb-short">perf. by</term>
-    <term name="producer" form="verb-short">prod. by</term>
-    <term name="script-writer" form="verb-short">writ. by</term>
-    <term name="series-creator" form="verb-short">cre. by</term>
+    <term name="compiler" form="verb-short">comp. da</term>
+    <term name="contributor" form="verb-short">con un contrib. di</term>
+    <term name="curator" form="verb-short">a c. di</term>
+    <term name="executive-producer" form="verb-short">prod. esec. di</term>
+    <term name="guest" form="verb-short">con osp.</term>
+    <term name="host" form="verb-short">cond. da</term>
+    <term name="narrator" form="verb-short">narr. da</term>
+    <term name="organizer" form="verb-short">org. da</term>
+    <term name="performer" form="verb-short">esec. di</term>
+    <term name="producer" form="verb-short">prod. da</term>
+    <term name="script-writer" form="verb-short">scr. da</term>
+    <term name="series-creator" form="verb-short">cre. da</term>
     <term name="director" form="verb-short">dir. da</term>
     <term name="editor" form="verb-short">a c. di</term>
-    <term name="editorial-director" form="verb-short">ed.</term>
+    <term name="editorial-director" form="verb-short">dir. ed. di</term>
     <term name="illustrator" form="verb-short">ill. da</term>
     <term name="translator" form="verb-short">trad. da</term>
     <term name="editortranslator" form="verb-short">a c. di e trad. da</term>
diff --git a/buildres/csl/csl-locales/locales-nb-NO.xml b/buildres/csl/csl-locales/locales-nb-NO.xml
index 19cb91d410a..f83cfb581e0 100644
--- a/buildres/csl/csl-locales/locales-nb-NO.xml
+++ b/buildres/csl/csl-locales/locales-nb-NO.xml
@@ -152,10 +152,10 @@
     <term name="song" form="short">audio rec.</term>
 
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">fvt.</term>
-    <term name="bc">evt.</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad">e.Kr.</term>
+    <term name="bc">f.Kr.</term>
+    <term name="bce">fvt.</term>
+    <term name="ce">evt.</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">«</term>
diff --git a/buildres/csl/csl-locales/locales-nn-NO.xml b/buildres/csl/csl-locales/locales-nn-NO.xml
index f48e7b07d76..a91cb07825e 100644
--- a/buildres/csl/csl-locales/locales-nn-NO.xml
+++ b/buildres/csl/csl-locales/locales-nn-NO.xml
@@ -152,10 +152,10 @@
     <term name="song" form="short">audio rec.</term>
 
     <!-- HISTORICAL ERA TERMS -->
-    <term name="ad">fvt.</term>
-    <term name="bc">evt.</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="ad">e.Kr.</term>
+    <term name="bc">f.Kr.</term>
+    <term name="bce">fvt.</term>
+    <term name="ce">evt.</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">«</term>
diff --git a/buildres/csl/csl-locales/locales-pt-PT.xml b/buildres/csl/csl-locales/locales-pt-PT.xml
index 48fbb4ee04c..929bd481b7b 100644
--- a/buildres/csl/csl-locales/locales-pt-PT.xml
+++ b/buildres/csl/csl-locales/locales-pt-PT.xml
@@ -21,30 +21,30 @@
   <terms>
     <term name="advance-online-publication">advance online publication</term>
     <term name="album">album</term>
-    <term name="audio-recording">audio recording</term>
-    <term name="film">film</term>
+    <term name="audio-recording">gravação áudio</term>
+    <term name="film">filme</term>
     <term name="henceforth">henceforth</term>
     <term name="loc-cit">loc. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="no-place">no place</term>
-    <term name="no-place" form="short">n.p.</term>
-    <term name="no-publisher">no publisher</term> <!-- sine nomine -->
-    <term name="no-publisher" form="short">n.p.</term>
-    <term name="on">on</term>
+    <term name="no-place">sem local</term>
+    <term name="no-place" form="short">s.l.</term>
+    <term name="no-publisher">sem editor</term> <!-- sine nomine -->
+    <term name="no-publisher" form="short">s.e.</term>
+    <term name="on">em</term>
     <term name="op-cit">op. cit.</term> <!-- like ibid., the abbreviated form is the regular form  -->
-    <term name="original-work-published">original work published</term>
+    <term name="original-work-published">trabalho original publicado</term>
     <term name="personal-communication">comunicação pessoal</term>
     <term name="podcast">podcast</term>
-    <term name="podcast-episode">podcast episode</term>
-    <term name="preprint">preprint</term>
-    <term name="radio-broadcast">radio broadcast</term>
-    <term name="radio-series">radio series</term>
+    <term name="podcast-episode">episódio podcast</term>
+    <term name="preprint">pré-impressão</term>
+    <term name="radio-broadcast">transmissão de rádio</term>
+    <term name="radio-series">série de rádio</term>
     <term name="radio-series-episode">radio series episode</term>
     <term name="special-issue">special issue</term>
     <term name="special-section">special section</term>
-    <term name="television-broadcast">television broadcast</term>
+    <term name="television-broadcast">transmissão televisiva</term>
     <term name="television-series">television series</term>
     <term name="television-series-episode">television series episode</term>
-    <term name="video">video</term>
+    <term name="video">vídeo</term>
     <term name="working-paper">working paper</term>
     <term name="accessed">acedido</term>
     <term name="and">e</term>
@@ -84,54 +84,54 @@
       <multiple>refs.</multiple>
     </term>
     <term name="retrieved">obtido</term>
-    <term name="scale">scale</term>
+    <term name="scale">escala</term>
     <term name="version">versão</term>
 
     <!-- LONG ITEM TYPE FORMS -->
-    <term name="article">preprint</term>
-    <term name="article-journal">journal article</term>
-    <term name="article-magazine">magazine article</term>
-    <term name="article-newspaper">newspaper article</term>
+    <term name="article">pré-impressão</term>
+    <term name="article-journal">article journal</term>
+    <term name="article-magazine">artigo de revista</term>
+    <term name="article-newspaper">artigo de jornal</term>
     <term name="bill">bill</term>
-    <term name="book">book</term>
-    <term name="broadcast">broadcast</term>
-    <term name="chapter">book chapter</term>
-    <term name="classic">classic</term>
-    <term name="collection">collection</term>
+    <term name="book">livro</term>
+    <term name="broadcast">transmissão</term>
+    <term name="chapter">capítulo de livro</term>
+    <term name="classic">clássico</term>
+    <term name="collection">coleção</term>
     <term name="dataset">dataset</term>
-    <term name="document">document</term>
+    <term name="document">documento</term>
     <term name="entry">entry</term>
-    <term name="entry-dictionary">dictionary entry</term>
-    <term name="entry-encyclopedia">encyclopedia entry</term>
-    <term name="event">event</term>
+    <term name="entry-dictionary">entrada de dicionário</term>
+    <term name="entry-encyclopedia">entrada de enciclopédia</term>
+    <term name="event">evento</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic">graphic</term>
-    <term name="hearing">hearing</term>
-    <term name="interview">interview</term>
+    <term name="graphic">gráfico</term>
+    <term name="hearing">audiência</term>
+    <term name="interview">entrevista</term>
     <term name="legal_case">legal case</term>
-    <term name="legislation">legislation</term>
-    <term name="manuscript">manuscript</term>
-    <term name="map">map</term>
-    <term name="motion_picture">video recording</term>
+    <term name="legislation">legislação</term>
+    <term name="manuscript">manuscrito</term>
+    <term name="map">mapa</term>
+    <term name="motion_picture">gravação de vídeo</term>
     <term name="musical_score">musical score</term>
-    <term name="pamphlet">pamphlet</term>
+    <term name="pamphlet">panfleto</term>
     <term name="paper-conference">conference paper</term>
-    <term name="patent">patent</term>
+    <term name="patent">patente</term>
     <term name="performance">performance</term>
-    <term name="periodical">periodical</term>
+    <term name="periodical">periódico</term>
     <term name="personal_communication">comunicação pessoal</term>
     <term name="post">post</term>
     <term name="post-weblog">blog post</term>
-    <term name="regulation">regulation</term>
-    <term name="report">report</term>
+    <term name="regulation">regulamento</term>
+    <term name="report">relatório</term>
     <term name="review">review</term>
     <term name="review-book">book review</term>
     <term name="software">software</term>
-    <term name="song">audio recording</term>
-    <term name="speech">presentation</term>
-    <term name="standard">standard</term>
-    <term name="thesis">thesis</term>
-    <term name="treaty">treaty</term>
+    <term name="song">gravação áudio</term>
+    <term name="speech">discurso</term>
+    <term name="standard">padrão</term>
+    <term name="thesis">tése</term>
+    <term name="treaty">tratado</term>
     <term name="webpage">webpage</term>
 
     <!-- SHORT ITEM TYPE FORMS -->
@@ -142,20 +142,20 @@
     <term name="chapter" form="short">bk. chap.</term>
     <term name="document" form="short">doc.</term>
     <!-- figure is in the list of locator terms -->
-    <term name="graphic" form="short">graph.</term>
-    <term name="interview" form="short">interv.</term>
+    <term name="graphic" form="short">gráf.</term>
+    <term name="interview" form="short">entrev.</term>
     <term name="manuscript" form="short">MS</term>
-    <term name="motion_picture" form="short">video rec.</term>
-    <term name="report" form="short">rep.</term>
+    <term name="motion_picture" form="short">transm. vídeo</term>
+    <term name="report" form="short">rel.</term>
     <term name="review" form="short">rev.</term>
     <term name="review-book" form="short">bk. rev.</term>
-    <term name="song" form="short">audio rec.</term>
+    <term name="song" form="short">grav. áudio</term>
 
     <!-- HISTORICAL ERA TERMS -->
     <term name="ad">AD</term>
-    <term name="bc">BC</term>
-    <term name="bce">BCE</term>
-    <term name="ce">CE</term>
+    <term name="bc">AC</term>
+    <term name="bce">AEC</term>
+    <term name="ce">EC</term>
 
     <!-- PUNCTUATION -->
     <term name="open-quote">«</term>
@@ -195,48 +195,48 @@
 
     <!-- LONG LOCATOR FORMS -->
     <term name="act">			 
-      <single>act</single>
-      <multiple>acts</multiple>						 
+      <single>ata</single>
+      <multiple>atas</multiple>						 
     </term>
     <term name="appendix">			 
-      <single>appendix</single>
-      <multiple>appendices</multiple>						 
+      <single>apêndice</single>
+      <multiple>apêndices</multiple>						 
     </term>
     <term name="article-locator">			 
-      <single>article</single>
-      <multiple>articles</multiple>						 
+      <single>artigo</single>
+      <multiple>artigos</multiple>						 
     </term>
     <term name="canon">			 
       <single>canon</single>
       <multiple>canons</multiple>						 
     </term>
     <term name="elocation">			 
-      <single>location</single>
-      <multiple>locations</multiple>						 
+      <single>localização</single>
+      <multiple>localizações</multiple>						 
     </term>
     <term name="equation">			 
-      <single>equation</single>
-      <multiple>equations</multiple>						 
+      <single>equação</single>
+      <multiple>equações</multiple>						 
     </term>
     <term name="rule">			 
-      <single>rule</single>
-      <multiple>rules</multiple>						 
+      <single>regra</single>
+      <multiple>regras</multiple>						 
     </term>
     <term name="scene">			 
-      <single>scene</single>
-      <multiple>scenes</multiple>						 
+      <single>cena</single>
+      <multiple>cenas</multiple>						 
     </term>
     <term name="table">			 
-      <single>table</single>
-      <multiple>tables</multiple>						 
+      <single>tabela</single>
+      <multiple>tabelas</multiple>						 
     </term>
     <term name="timestamp"> <!-- generally blank -->
       <single></single>
       <multiple></multiple>						 
     </term>
     <term name="title-locator">			 
-      <single>title</single>
-      <multiple>titles</multiple>						 
+      <single>título</single>
+      <multiple>títulos</multiple>						 
     </term>
     <term name="book">
       <single>livro</single>
@@ -341,15 +341,15 @@
       <multiple></multiple>						 
     </term>
     <term name="title-locator">			 
-      <single>tit.</single>
-      <multiple>tits.</multiple>
+      <single>tít.</single>
+      <multiple>títs.</multiple>
     </term>
     <term name="book" form="short">liv.</term>
     <term name="chapter" form="short">cap.</term>
     <term name="column" form="short">col.</term>
     <term name="figure" form="short">fig.</term>
     <term name="folio" form="short">f.</term>
-    <term name="issue" form="short">n.</term>
+    <term name="issue" form="short">n.º</term>
     <term name="line" form="short">l.</term>
     <term name="note" form="short">n.</term>
     <term name="opus" form="short">op.</term>
@@ -389,68 +389,68 @@
 
     <!-- LONG ROLE FORMS -->
     <term name="chair">
-      <single>chair</single>
-      <multiple>chairs</multiple>
+      <single>cadeira</single>
+      <multiple>cadeiras</multiple>
     </term>
     <term name="compiler">
-      <single>compiler</single>
-      <multiple>compilers</multiple>
+      <single>compilador</single>
+      <multiple>compiladores</multiple>
     </term>
     <term name="contributor">
-      <single>contributor</single>
-      <multiple>contributors</multiple>
+      <single>contribuinte</single>
+      <multiple>contribuintes</multiple>
     </term>
     <term name="curator">
-      <single>curator</single>
-      <multiple>curators</multiple>
+      <single>curador</single>
+      <multiple>curadores</multiple>
     </term>
     <term name="executive-producer">
-      <single>executive producer</single>
-      <multiple>executive producers</multiple>
+      <single>produtor executivo</single>
+      <multiple>produtores executivos</multiple>
     </term>
     <term name="guest">
-      <single>guest</single>
-      <multiple>guests</multiple>
+      <single>convidado</single>
+      <multiple>convidados</multiple>
     </term>
     <term name="host">
-      <single>host</single>
-      <multiple>hosts</multiple>
+      <single>anfitrião</single>
+      <multiple>anfitriões</multiple>
     </term>
     <term name="narrator">
-      <single>narrator</single>
-      <multiple>narrators</multiple>
+      <single>narrador</single>
+      <multiple>narradores</multiple>
     </term>
     <term name="organizer">
-      <single>organizer</single>
-      <multiple>organizers</multiple>
+      <single>organizador</single>
+      <multiple>organizadores</multiple>
     </term>
     <term name="performer">
-      <single>performer</single>
-      <multiple>performers</multiple>
+      <single>ator</single>
+      <multiple>atores</multiple>
     </term>
     <term name="producer">
-      <single>producer</single>
-      <multiple>producers</multiple>
+      <single>produtor</single>
+      <multiple>produtores</multiple>
     </term>
     <term name="script-writer">
-      <single>writer</single>
-      <multiple>writers</multiple>
+      <single>escritor</single>
+      <multiple>escritores</multiple>
     </term>
     <term name="series-creator">
-      <single>series creator</single>
-      <multiple>series creators</multiple>
+      <single>criador de séries</single>
+      <multiple>criadores de séries</multiple>
     </term>
     <term name="director">
-      <single>director</single>
-      <multiple>directores</multiple>
+      <single>diretor</single>
+      <multiple>diretores</multiple>
     </term>
     <term name="editor">
       <single>editor</single>
       <multiple>editores</multiple>
     </term>
     <term name="editorial-director">
-      <single>editor</single>
-      <multiple>editores</multiple>
+      <single>diretor editorial</single>
+      <multiple>diretores editoriais</multiple>
     </term>
     <term name="illustrator">
       <single>ilustrador</single>
@@ -461,8 +461,8 @@
       <multiple>tradutores</multiple>
     </term>
     <term name="editortranslator">
-      <single>editor &amp; tradutor</single>
-      <multiple>editores &amp; tradutores</multiple>
+      <single>editor e tradutor</single>
+      <multiple>editores e tradutores</multiple>
     </term>
 
     <!-- SHORT ROLE FORMS -->
@@ -479,8 +479,8 @@
       <multiple>curs.</multiple>
     </term>
     <term name="executive-producer" form="short">
-      <single>exec. prod.</single>
-      <multiple>exec. prods.</multiple>
+      <single>prod. exec.</single>
+      <multiple>prods. exec.</multiple>
     </term>
     <term name="narrator" form="short">
       <single>narr.</single>
@@ -532,19 +532,19 @@
     </term>
 
     <!-- VERB ROLE FORMS -->
-    <term name="chair" form="verb">chaired by</term>
-    <term name="compiler" form="verb">compiled by</term>
-    <term name="contributor" form="verb">with</term>
-    <term name="curator" form="verb">curated by</term>
+    <term name="chair" form="verb">presidido por</term>
+    <term name="compiler" form="verb">compilado por</term>
+    <term name="contributor" form="verb">com</term>
+    <term name="curator" form="verb">curado por</term>
     <term name="executive-producer" form="verb">executive produced by</term>
-    <term name="guest" form="verb">with guest</term>
+    <term name="guest" form="verb">com convidado</term>
     <term name="host" form="verb">hosted by</term>
-    <term name="narrator" form="verb">narrated by</term>
-    <term name="organizer" form="verb">organized by</term>
-    <term name="performer" form="verb">performed by</term>
-    <term name="producer" form="verb">produced by</term>
-    <term name="script-writer" form="verb">written by</term>
-    <term name="series-creator" form="verb">created by</term>
+    <term name="narrator" form="verb">narrado por</term>
+    <term name="organizer" form="verb">organizado por</term>
+    <term name="performer" form="verb">atuado por</term>
+    <term name="producer" form="verb">produzido por</term>
+    <term name="script-writer" form="verb">escrito por</term>
+    <term name="series-creator" form="verb">criado por</term>
     <term name="container-author" form="verb">por</term>
     <term name="director" form="verb">dirigido por</term>
     <term name="editor" form="verb">editado por</term>
@@ -554,7 +554,7 @@
     <term name="recipient" form="verb">para</term>
     <term name="reviewed-author" form="verb">revisto por</term>
     <term name="translator" form="verb">traduzido por</term>
-    <term name="editortranslator" form="verb">editado &amp; traduzido por</term>
+    <term name="editortranslator" form="verb">editado e traduzido por</term>
 
     <!-- SHORT VERB ROLE FORMS -->
     <term name="compiler" form="verb-short">comp. by</term>
diff --git a/buildres/csl/csl-styles/.github/workflows/label-gun.yml b/buildres/csl/csl-styles/.github/workflows/label-gun.yml
index d4d022673f8..c87c1721b75 100644
--- a/buildres/csl/csl-styles/.github/workflows/label-gun.yml
+++ b/buildres/csl/csl-styles/.github/workflows/label-gun.yml
@@ -6,8 +6,13 @@ on:
   issue_comment:
     types: [created, edited, closed]
 
+permissions: {}
 jobs:
   label:
+    permissions:
+      issues: write # to add label to an issues (retorquere/label-gun)
+      pull-requests: write # to add label, comment on pull request (retorquere/label-gun)
+
     runs-on: ubuntu-latest
     steps:
       - uses: retorquere/label-gun@main
diff --git a/buildres/csl/csl-styles/.github/workflows/merge.yaml b/buildres/csl/csl-styles/.github/workflows/merge.yaml
index f52a6ba4110..c1efb7eab07 100644
--- a/buildres/csl/csl-styles/.github/workflows/merge.yaml
+++ b/buildres/csl/csl-styles/.github/workflows/merge.yaml
@@ -12,8 +12,13 @@ on:
         description: Commit message
         required: true
 
+permissions: {}
 jobs:
   release:
+    permissions:
+      contents: write # to create a release
+      pull-requests: read # to read pull requests (dorny/paths-filter)
+
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/buildres/csl/csl-styles/.github/workflows/sheldon.yaml b/buildres/csl/csl-styles/.github/workflows/sheldon.yaml
index 9bf525949f1..42962c95090 100644
--- a/buildres/csl/csl-styles/.github/workflows/sheldon.yaml
+++ b/buildres/csl/csl-styles/.github/workflows/sheldon.yaml
@@ -4,8 +4,13 @@ on:
   pull_request_target:
     types: [ opened, synchronize, workflow_dispatch]
 
+permissions: {}
 jobs:
   test:
+    permissions:
+      contents: write # to push code in repo (stefanzweifel/git-auto-commit-action)
+      pull-requests: write # to comment on pull requests
+
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
diff --git a/buildres/csl/csl-styles/american-chemical-society.csl b/buildres/csl/csl-styles/american-chemical-society.csl
index 09c0e9cf088..b7d421858bd 100644
--- a/buildres/csl/csl-styles/american-chemical-society.csl
+++ b/buildres/csl/csl-styles/american-chemical-society.csl
@@ -148,7 +148,7 @@
   </citation>
   <bibliography second-field-align="flush" entry-spacing="0">
     <layout suffix=".">
-      <text variable="citation-number" prefix="(" suffix=") "/>
+      <text variable="citation-number" prefix="(" suffix=")"/>
       <text macro="author" suffix=" "/>
       <choose>
         <if type="article-journal review" match="any">
diff --git a/buildres/csl/csl-styles/american-medical-association.csl b/buildres/csl/csl-styles/american-medical-association.csl
index b36bbb5488e..e8772592b34 100644
--- a/buildres/csl/csl-styles/american-medical-association.csl
+++ b/buildres/csl/csl-styles/american-medical-association.csl
@@ -124,7 +124,7 @@
   </citation>
   <bibliography hanging-indent="false" et-al-min="7" et-al-use-first="3" second-field-align="flush">
     <layout>
-      <text variable="citation-number" suffix=". "/>
+      <text variable="citation-number" suffix="."/>
       <text macro="author"/>
       <text macro="title" prefix=" " suffix="."/>
       <choose>
diff --git a/buildres/csl/csl-styles/angiology.csl b/buildres/csl/csl-styles/angiology.csl
new file mode 100644
index 00000000000..8cd8da147b8
--- /dev/null
+++ b/buildres/csl/csl-styles/angiology.csl
@@ -0,0 +1,200 @@
+<?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="sort-only" page-range-format="minimal" default-locale="en-US">
+  <info>
+    <title>Angiology</title>
+    <title-short>Angiology</title-short>
+    <id>http://www.zotero.org/styles/angiology</id>
+    <link href="http://www.zotero.org/styles/angiology" rel="self"/>
+    <link href="http://www.zotero.org/styles/sage-vancouver" rel="template"/>
+    <link href="https://journals.sagepub.com/author-instructions/ANG" rel="documentation"/>
+    <contributor>
+      <name>Andrew J. Sims</name>
+      <email>andrew.sims@newcastle.ac.uk</email>
+    </contributor>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <issn>0003-3197</issn>
+    <eissn>1940-1574</eissn>
+    <summary>Vancouver superscript style modified for Angiology</summary>
+    <updated>2022-07-05T15:11: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>
+  <macro name="author">
+    <names variable="author" suffix=". ">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="editor">
+    <names variable="editor">
+      <name sort-separator=" " initialize-with="" name-as-sort-order="all" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" (" suffix=")" strip-periods="true"/>
+    </names>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if type="article-newspaper report" match="any">
+        <date variable="issued" form="text"/>
+      </if>
+      <else>
+        <date variable="issued" form="text" date-parts="year"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <group delimiter=" ">
+        <text variable="genre" text-case="title"/>
+        <text variable="number"/>
+      </group>
+      <group delimiter=": ">
+        <choose>
+          <if type="thesis" match="none">
+            <text variable="publisher-place"/>
+          </if>
+        </choose>
+        <text variable="publisher"/>
+      </group>
+      <choose>
+        <if variable="URL" match="none">
+          <text macro="date"/>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="page" match="none">
+        <choose>
+          <if variable="DOI" match="any">
+            <group prefix=". " delimiter=". ">
+              <date variable="issued" form="text" prefix=""/>
+              <text variable="DOI" prefix="DOI: "/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" " prefix=", ">
+              <text variable="URL"/>
+              <text macro="accessed-date"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="accessed-date">
+    <choose>
+      <if variable="URL">
+        <group prefix="(" suffix=")" delimiter=", ">
+          <text macro="date"/>
+          <group delimiter=" ">
+            <text term="accessed"/>
+            <date variable="accessed" form="text"/>
+          </group>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="article-journal" match="any">
+        <text variable="container-title" form="short" strip-periods="true" suffix="."/>
+      </if>
+      <else>
+        <text variable="container-title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book patent report thesis" match="any">
+        <text variable="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="page">
+    <group delimiter=" ">
+      <label variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="3" second-field-align="flush" line-spacing="2">
+    <layout suffix=".">
+      <text variable="citation-number" suffix=". "/>
+      <text macro="author"/>
+      <text macro="title"/>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture patent report song thesis" match="any">
+          <group delimiter=". " prefix=". ">
+            <text macro="edition"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=", " prefix=". ">
+            <group delimiter=". ">
+              <group delimiter=" ">
+                <text term="in" suffix=":" text-case="capitalize-first"/>
+                <text macro="editor"/>
+                <text variable="container-title"/>
+              </group>
+              <text macro="publisher"/>
+            </group>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper article-magazine" match="any">
+          <group delimiter=", " prefix=". ">
+            <text macro="container-title"/>
+            <text macro="date"/>
+            <text macro="page"/>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter=";" prefix=". ">
+            <group delimiter=" ">
+              <text macro="container-title"/>
+              <choose>
+                <if variable="page" match="any">
+                  <text macro="date"/>
+                </if>
+              </choose>
+            </group>
+            <group delimiter=":">
+              <text variable="volume"/>
+              <text variable="page"/>
+            </group>
+          </group>
+        </else>
+      </choose>
+      <text macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/biologiceskie-membrany.csl b/buildres/csl/csl-styles/biologiceskie-membrany.csl
new file mode 100644
index 00000000000..2d5c19fbe06
--- /dev/null
+++ b/buildres/csl/csl-styles/biologiceskie-membrany.csl
@@ -0,0 +1,145 @@
+<?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="sort-only" page-range-format="minimal" default-locale="en-US">
+  <info>
+    <title>Биологические мембраны</title>
+    <id>http://www.zotero.org/styles/biologiceskie-membrany</id>
+    <link href="http://www.zotero.org/styles/biologiceskie-membrany" rel="self"/>
+    <link href="http://www.zotero.org/styles/molecular-biology" rel="template"/>
+    <link href="https://sciencejournals.ru/journals/biomem/guid.pdf" rel="documentation"/>
+    <author>
+      <name>Vladimir Krasnobaev</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>0233-4755</issn>
+    <updated>2020-11-15T05:18:11+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="edition">
+    <choose>
+      <if is-numeric="edition" match="any">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" text-case="capitalize-first" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <label form="short" text-case="capitalize-first" strip-periods="true"/>
+      <name prefix=" " delimiter-precedes-last="never" initialize-with="."/>
+    </names>
+  </macro>
+  <macro name="anon">
+    <text term="anonymous" form="short" text-case="capitalize-first" strip-periods="true" suffix="."/>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name initialize-with="." name-as-sort-order="all" sort-separator=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <text macro="anon"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <text variable="title" font-style="italic" suffix="."/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="pages">
+    <group>
+      <label strip-periods="false" suffix=" " variable="page" form="short"/>
+      <text variable="page"/>
+    </group>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" strip-periods="false"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter=", " prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography second-field-align="flush" et-al-min="10" et-al-use-first="1">
+    <layout suffix=".">
+      <text variable="citation-number" suffix="."/>
+      <group delimiter=". ">
+        <text macro="author"/>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+        <text macro="title"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <group delimiter=". ">
+              <text macro="volume"/>
+              <text macro="editor"/>
+              <text macro="edition"/>
+              <text macro="publisher" suffix=". "/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". " prefix=" ">
+              <group delimiter=": ">
+                <text term="in" text-case="capitalize-first"/>
+                <group delimiter=", ">
+                  <text variable="container-title" suffix="."/>
+                  <text macro="volume"/>
+                </group>
+              </group>
+              <text variable="collection-title"/>
+              <text macro="edition"/>
+              <text variable="event"/>
+              <text macro="editor"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group prefix=" " delimiter=" ">
+              <text variable="genre"/>
+              <text macro="publisher"/>
+            </group>
+          </else-if>
+          <else-if type="webpage post-weblog post" match="any">
+            <text variable="URL"/>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="editor"/>
+              <text variable="container-title" form="short" font-style="italic"/>
+              <group delimiter=", ">
+                <text variable="volume" font-weight="bold"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/cell-numeric-superscript.csl b/buildres/csl/csl-styles/cell-numeric-superscript.csl
deleted file mode 100644
index c928f064c24..00000000000
--- a/buildres/csl/csl-styles/cell-numeric-superscript.csl
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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="sort-only" default-locale="en-US">
-  <info>
-    <title>Cell journals (numeric, superscript)</title>
-    <id>http://www.zotero.org/styles/cell-numeric-superscript</id>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="self"/>
-    <link href="http://www.cell.com/chem/authors" rel="documentation"/>
-    <author>
-      <name>Sebastian Karcher</name>
-    </author>
-    <contributor>
-      <name>Julian Onions</name>
-      <email>julian.onions@gmail.com</email>
-    </contributor>
-    <category citation-format="numeric"/>
-    <category field="biology"/>
-    <summary>The style for Cell Journals using numerical citations in superscript, such as Chem</summary>
-    <updated>2019-10-29T19:17:19+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">
-    <names variable="editor" delimiter=", ">
-      <name and="text" initialize-with=". " delimiter=", "/>
-      <label form="short" prefix=", "/>
-    </names>
-  </macro>
-  <macro name="author">
-    <names variable="author">
-      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
-      <label form="short" prefix=" "/>
-      <substitute>
-        <names variable="editor"/>
-        <text variable="title"/>
-      </substitute>
-    </names>
-  </macro>
-  <macro name="access">
-    <choose>
-      <if match="any" variable="DOI">
-        <text variable="DOI"/>
-      </if>
-      <else-if match="any" type="webpage dataset entry-dictionary entry-encyclopedia post post-weblog">
-        <text variable="URL"/>
-      </else-if>
-    </choose>
-  </macro>
-  <macro name="title">
-    <text variable="title"/>
-  </macro>
-  <macro name="publisher">
-    <text variable="publisher" prefix="(" suffix=")"/>
-  </macro>
-  <macro name="edition">
-    <choose>
-      <if is-numeric="edition">
-        <group delimiter=" ">
-          <number variable="edition" form="ordinal"/>
-          <text term="edition" form="short"/>
-        </group>
-      </if>
-      <else>
-        <text variable="edition" suffix="."/>
-      </else>
-    </choose>
-  </macro>
-  <citation collapse="citation-number">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout vertical-align="sup" delimiter=",">
-      <text variable="citation-number"/>
-    </layout>
-  </citation>
-  <bibliography et-al-min="11" et-al-use-first="10" second-field-align="flush">
-    <sort>
-      <key variable="citation-number"/>
-    </sort>
-    <layout suffix=".">
-      <text variable="citation-number" suffix="."/>
-      <text macro="author"/>
-      <date variable="issued" prefix=" (" suffix=").">
-        <date-part name="year"/>
-      </date>
-      <choose>
-        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
-          <group delimiter=" " prefix=" ">
-            <text macro="title"/>
-            <text macro="edition"/>
-            <text macro="editor"/>
-            <text macro="publisher"/>
-          </group>
-        </if>
-        <else-if type="chapter paper-conference" match="any">
-          <group delimiter=" " prefix=" ">
-            <text macro="title" suffix="."/>
-            <text term="in" text-case="capitalize-first"/>
-            <text variable="container-title"/>
-            <text variable="collection-title" suffix="."/>
-          </group>
-          <text macro="editor" prefix=", "/>
-          <group suffix=".">
-            <text macro="publisher" prefix=" "/>
-            <group prefix=", ">
-              <label variable="page" suffix=" " form="short"/>
-              <text variable="page"/>
-            </group>
-          </group>
-        </else-if>
-        <else>
-          <text macro="title" prefix=" " suffix="."/>
-          <group delimiter=", " prefix=" " suffix=".">
-            <group delimiter=" ">
-              <text variable="container-title" form="short"/>
-              <text variable="volume" font-style="italic"/>
-            </group>
-            <text variable="page"/>
-          </group>
-        </else>
-      </choose>
-      <text prefix=" " macro="access"/>
-    </layout>
-  </bibliography>
-</style>
diff --git a/buildres/csl/csl-styles/cell.csl b/buildres/csl/csl-styles/cell.csl
index 4c29acbd6bf..80635fd5fd8 100644
--- a/buildres/csl/csl-styles/cell.csl
+++ b/buildres/csl/csl-styles/cell.csl
@@ -4,7 +4,7 @@
     <title>Cell</title>
     <id>http://www.zotero.org/styles/cell</id>
     <link href="http://www.zotero.org/styles/cell" rel="self"/>
-    <link href="http://www.cell.com/authors" rel="documentation"/>
+    <link href="https://www.cell.com/cell/authors" rel="documentation"/>
     <author>
       <name>Adam Mark</name>
       <email>a.mark@uoguelph.ca</email>
@@ -17,113 +17,114 @@
       <name>Aurimas Vinckevicius</name>
       <email>aurimas.dev@gmail.com</email>
     </contributor>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <issn>0092-8674</issn>
     <eissn>1097-4172</eissn>
-    <summary>The Cell journal style. Original by Julian Onions.</summary>
-    <updated>2013-01-26T22:06:38+00:00</updated>
+    <summary>The Cell journal style, switched to numeric superscript as per the Cell editorial office in Sept. 2022</summary>
+    <updated>2022-09-23T22:06:38+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
-  <macro name="author-short">
-    <names variable="author">
-      <name form="short" and="text"/>
-    </names>
-  </macro>
-  <macro name="author-count">
-    <names variable="author">
-      <name form="count"/>
+  <macro name="editor">
+    <names variable="editor" delimiter=", ">
+      <name and="text" initialize-with=". " delimiter=", "/>
+      <label form="short" prefix=", "/>
     </names>
   </macro>
   <macro name="author">
     <names variable="author">
-      <name name-as-sort-order="all" initialize-with="." and="text" delimiter-precedes-last="always"/>
+      <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with="." delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="issued">
-    <date variable="issued">
-      <date-part name="year"/>
-    </date>
+  <macro name="access">
+    <choose>
+      <if match="any" variable="DOI">
+        <text variable="DOI"/>
+      </if>
+      <else-if match="any" type="webpage dataset entry-dictionary entry-encyclopedia post post-weblog">
+        <text variable="URL"/>
+      </else-if>
+    </choose>
   </macro>
-  <macro name="publisher">
-    <group prefix="(" delimiter=": " suffix=")">
-      <text variable="publisher-place"/>
-      <text variable="publisher"/>
-    </group>
+  <macro name="title">
+    <text variable="title"/>
   </macro>
-  <macro name="editor">
-    <names variable="editor">
-      <name initialize-with="." and="text" delimiter-precedes-last="always"/>
-      <label form="short" prefix=", "/>
-    </names>
+  <macro name="publisher">
+    <text variable="publisher" prefix="(" suffix=")"/>
   </macro>
-  <macro name="doi">
+  <macro name="edition">
     <choose>
-      <if variable="DOI">
-        <text variable="DOI" prefix="https://doi.org/"/>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
       </if>
-      <else-if type="webpage post post-weblog" match="any">
-        <text variable="URL"/>
-      </else-if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
     </choose>
   </macro>
-  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
+  <citation collapse="citation-number">
     <sort>
-      <key macro="author-short" names-min="1" names-use-first="1"/>
-      <key macro="author-count" names-min="3" names-use-first="3"/>
-      <key macro="author" names-min="3" names-use-first="1"/>
-      <key macro="issued"/>
-      <key variable="title"/>
+      <key variable="citation-number"/>
     </sort>
-    <layout prefix="(" suffix=")" delimiter="; ">
-      <group delimiter=", ">
-        <text macro="author-short"/>
-        <text macro="issued"/>
-      </group>
+    <layout vertical-align="sup" delimiter=",">
+      <text variable="citation-number"/>
     </layout>
   </citation>
-  <bibliography et-al-min="11" et-al-use-first="10">
+  <bibliography et-al-min="11" et-al-use-first="10" second-field-align="flush">
     <sort>
-      <key macro="author-short" names-min="1" names-use-first="1"/>
-      <key macro="author-count" names-min="3" names-use-first="3"/>
-      <key macro="author" names-min="3" names-use-first="1"/>
-      <key macro="issued"/>
+      <key variable="citation-number"/>
     </sort>
     <layout suffix=".">
-      <group delimiter=" ">
-        <text macro="author"/>
-        <text macro="issued" prefix="(" suffix=")."/>
-        <choose>
-          <if type="article article-magazine article-newspaper article-journal review" match="any">
-            <text variable="title" suffix="."/>
-            <text variable="container-title" form="short" text-case="title"/>
-            <group delimiter=", " suffix=". ">
-              <text variable="volume" font-style="italic"/>
+      <text variable="citation-number" suffix="."/>
+      <text macro="author"/>
+      <date variable="issued" prefix=" (" suffix=").">
+        <date-part name="year"/>
+      </date>
+      <choose>
+        <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+          <group delimiter=" " prefix=" ">
+            <text macro="title"/>
+            <text macro="edition"/>
+            <text macro="editor"/>
+            <text macro="publisher"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter=" " prefix=" ">
+            <text macro="title" suffix="."/>
+            <text term="in" text-case="capitalize-first"/>
+            <text variable="container-title"/>
+            <text variable="collection-title" suffix="."/>
+          </group>
+          <text macro="editor" prefix=", "/>
+          <group suffix=".">
+            <text macro="publisher" prefix=" "/>
+            <group prefix=", ">
+              <label variable="page" suffix=" " form="short"/>
               <text variable="page"/>
             </group>
-            <group>
-              <text macro="doi"/>
+          </group>
+        </else-if>
+        <else>
+          <text macro="title" prefix=" " suffix="."/>
+          <group delimiter=", " prefix=" " suffix=".">
+            <group delimiter=" ">
+              <text variable="container-title" form="short"/>
+              <text variable="volume" font-style="italic"/>
             </group>
-          </if>
-          <else-if type="chapter paper-conference" match="any">
-            <text variable="title" suffix="."/>
-            <text variable="container-title" prefix="In " suffix="," text-case="title"/>
-            <text macro="editor"/>
-            <text macro="publisher" suffix=","/>
-            <label variable="page" form="short"/>
             <text variable="page"/>
-          </else-if>
-          <else-if type="thesis">
-            <text variable="title" suffix="."/>
-            <text variable="genre" suffix="."/>
-            <text variable="publisher"/>
-          </else-if>
-          <else>
-            <text variable="title"/>
-            <text macro="publisher"/>
-          </else>
-        </choose>
-      </group>
+          </group>
+        </else>
+      </choose>
+      <text prefix=" " macro="access"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cancer-cell.csl b/buildres/csl/csl-styles/dependent/cancer-cell.csl
index 0b835e10ef2..cd5b5bd118b 100644
--- a/buildres/csl/csl-styles/dependent/cancer-cell.csl
+++ b/buildres/csl/csl-styles/dependent/cancer-cell.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/cancer-cell" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/cancer-cell/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>1535-6108</issn>
     <eissn>1878-3686</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cell-chemical-biology.csl b/buildres/csl/csl-styles/dependent/cell-chemical-biology.csl
index 297bd541f27..d1bb1ad25b7 100644
--- a/buildres/csl/csl-styles/dependent/cell-chemical-biology.csl
+++ b/buildres/csl/csl-styles/dependent/cell-chemical-biology.csl
@@ -7,11 +7,11 @@
     <link href="http://www.zotero.org/styles/cell-chemical-biology" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/cell-chemical-biology/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <eissn>2451-9456</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cell-genomics.csl b/buildres/csl/csl-styles/dependent/cell-genomics.csl
new file mode 100644
index 00000000000..4ea7fee1309
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/cell-genomics.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Cell Genomics</title>
+    <id>http://www.zotero.org/styles/cell-genomics</id>
+    <link href="http://www.zotero.org/styles/cell-genomics" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/cell-genomics/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>2666-979X</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/cell-host-and-microbe.csl b/buildres/csl/csl-styles/dependent/cell-host-and-microbe.csl
index b360f70ef8c..bea71d5db54 100644
--- a/buildres/csl/csl-styles/dependent/cell-host-and-microbe.csl
+++ b/buildres/csl/csl-styles/dependent/cell-host-and-microbe.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/cell-host-and-microbe" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/cell-host-microbe/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>1931-3128</issn>
     <eissn>1934-6069</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cell-metabolism.csl b/buildres/csl/csl-styles/dependent/cell-metabolism.csl
index 2a671ef3b7a..24f8dc2c5da 100644
--- a/buildres/csl/csl-styles/dependent/cell-metabolism.csl
+++ b/buildres/csl/csl-styles/dependent/cell-metabolism.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/cell-metabolism" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/cell-metabolism/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>1550-4131</issn>
     <eissn>1932-7420</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cell-reports-medicine.csl b/buildres/csl/csl-styles/dependent/cell-reports-medicine.csl
new file mode 100644
index 00000000000..ce4e7b0d289
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/cell-reports-medicine.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Cell Reports Medicine</title>
+    <id>http://www.zotero.org/styles/cell-reports-medicine</id>
+    <link href="http://www.zotero.org/styles/cell-reports-medicine" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/cell-reports-medicine/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <category field="biology"/>
+    <eissn>2666-3791</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/stem-cell-reports.csl b/buildres/csl/csl-styles/dependent/cell-reports-methods.csl
similarity index 60%
rename from buildres/csl/csl-styles/dependent/stem-cell-reports.csl
rename to buildres/csl/csl-styles/dependent/cell-reports-methods.csl
index 0d3d60a98fa..1ddaf2a5536 100644
--- a/buildres/csl/csl-styles/dependent/stem-cell-reports.csl
+++ b/buildres/csl/csl-styles/dependent/cell-reports-methods.csl
@@ -2,16 +2,16 @@
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
   <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
   <info>
-    <title>Stem Cell Reports</title>
-    <id>http://www.zotero.org/styles/stem-cell-reports</id>
-    <link href="http://www.zotero.org/styles/stem-cell-reports" rel="self"/>
+    <title>Cell Reports Methods</title>
+    <id>http://www.zotero.org/styles/cell-reports-methods</id>
+    <link href="http://www.zotero.org/styles/cell-reports-methods" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
-    <link href="http://www.cell.com/stem-cell-reports/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <link href="https://www.cell.com/cell-reports-methods/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
-    <eissn>2213-6711</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <eissn>2667-2375</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cell-reports-physcial-science.csl b/buildres/csl/csl-styles/dependent/cell-reports-physcial-science.csl
new file mode 100644
index 00000000000..3d8ec283509
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/cell-reports-physcial-science.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Cell Reports Physcial Science</title>
+    <id>http://www.zotero.org/styles/cell-reports-physcial-science</id>
+    <link href="http://www.zotero.org/styles/cell-reports-physcial-science" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/cell-reports-physical-science/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="chemistry"/>
+    <category field="physics"/>
+    <eissn>2666-3864</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/cell-reports.csl b/buildres/csl/csl-styles/dependent/cell-reports.csl
index cf5ddbb3723..83a5c1a58a6 100644
--- a/buildres/csl/csl-styles/dependent/cell-reports.csl
+++ b/buildres/csl/csl-styles/dependent/cell-reports.csl
@@ -7,11 +7,11 @@
     <link href="http://www.zotero.org/styles/cell-reports" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/cell-reports/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>2211-1247</issn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cell-stem-cell.csl b/buildres/csl/csl-styles/dependent/cell-stem-cell.csl
index e34749d7560..74797176799 100644
--- a/buildres/csl/csl-styles/dependent/cell-stem-cell.csl
+++ b/buildres/csl/csl-styles/dependent/cell-stem-cell.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/cell-stem-cell" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/cell-stem-cell/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>1934-5909</issn>
     <eissn>1875-9777</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/cell-systems.csl b/buildres/csl/csl-styles/dependent/cell-systems.csl
index e98444a82d4..c1bdd10d53d 100644
--- a/buildres/csl/csl-styles/dependent/cell-systems.csl
+++ b/buildres/csl/csl-styles/dependent/cell-systems.csl
@@ -7,7 +7,7 @@
     <link href="http://www.zotero.org/styles/cell-systems" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/cell-systems/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>2405-4712</issn>
diff --git a/buildres/csl/csl-styles/dependent/chem-catalysis.csl b/buildres/csl/csl-styles/dependent/chem-catalysis.csl
index a9f989fb74a..919f71891f0 100644
--- a/buildres/csl/csl-styles/dependent/chem-catalysis.csl
+++ b/buildres/csl/csl-styles/dependent/chem-catalysis.csl
@@ -5,12 +5,12 @@
     <title>Chem Catalysis</title>
     <id>http://www.zotero.org/styles/chem-catalysis</id>
     <link href="http://www.zotero.org/styles/chem-catalysis" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/chem-catalysis/authors" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="chemistry"/>
     <eissn>2667-1093</eissn>
-    <updated>2020-10-20T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/chem.csl b/buildres/csl/csl-styles/dependent/chem.csl
index 0ef7aed6845..7d19a14ebee 100644
--- a/buildres/csl/csl-styles/dependent/chem.csl
+++ b/buildres/csl/csl-styles/dependent/chem.csl
@@ -5,13 +5,12 @@
     <title>Chem</title>
     <id>http://www.zotero.org/styles/chem</id>
     <link href="http://www.zotero.org/styles/chem" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/chem/authors" rel="documentation"/>
     <category citation-format="numeric"/>
-    <category field="biology"/>
     <category field="chemistry"/>
     <eissn>2451-9294</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/current-biology.csl b/buildres/csl/csl-styles/dependent/current-biology.csl
index 224648bdd5e..6329890f928 100644
--- a/buildres/csl/csl-styles/dependent/current-biology.csl
+++ b/buildres/csl/csl-styles/dependent/current-biology.csl
@@ -5,7 +5,7 @@
     <title>Current Biology</title>
     <id>http://www.zotero.org/styles/current-biology</id>
     <link href="http://www.zotero.org/styles/current-biology" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/current-biology/authors" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="biology"/>
diff --git a/buildres/csl/csl-styles/dependent/developmental-cell.csl b/buildres/csl/csl-styles/dependent/developmental-cell.csl
index ecd9ee313c8..259227edda7 100644
--- a/buildres/csl/csl-styles/dependent/developmental-cell.csl
+++ b/buildres/csl/csl-styles/dependent/developmental-cell.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/developmental-cell" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/developmental-cell/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>1534-5807</issn>
     <eissn>1878-1551</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/hgg-advances.csl b/buildres/csl/csl-styles/dependent/hgg-advances.csl
new file mode 100644
index 00000000000..1200eee76d7
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/hgg-advances.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>HGG Advances</title>
+    <id>http://www.zotero.org/styles/hgg-advances</id>
+    <link href="http://www.zotero.org/styles/hgg-advances" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/hgg-advances/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <eissn>2666-2477</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/immunity.csl b/buildres/csl/csl-styles/dependent/immunity.csl
index fa6ed30361b..a681ae8afaa 100644
--- a/buildres/csl/csl-styles/dependent/immunity.csl
+++ b/buildres/csl/csl-styles/dependent/immunity.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/immunity" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/immunity/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>1074-7613</issn>
     <eissn>1097-4180</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/iscience.csl b/buildres/csl/csl-styles/dependent/iscience.csl
index bae308d4ee7..2e16d6655b5 100644
--- a/buildres/csl/csl-styles/dependent/iscience.csl
+++ b/buildres/csl/csl-styles/dependent/iscience.csl
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Elsevier, generated from "elsevier" metadata at https://github.com/citation-style-language/journals -->
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>iScience</title>
     <id>http://www.zotero.org/styles/iscience</id>
     <link href="http://www.zotero.org/styles/iscience" rel="self"/>
-    <link href="http://www.zotero.org/styles/elsevier-harvard" rel="independent-parent"/>
-    <category citation-format="author-date"/>
-    <issn>2589-0042</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/iscience/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <eissn>2589-0042</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/joule.csl b/buildres/csl/csl-styles/dependent/joule.csl
index f7552902c73..b6fff2f3bc2 100644
--- a/buildres/csl/csl-styles/dependent/joule.csl
+++ b/buildres/csl/csl-styles/dependent/joule.csl
@@ -5,7 +5,7 @@
     <title>Joule</title>
     <id>http://www.zotero.org/styles/joule</id>
     <link href="http://www.zotero.org/styles/joule" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/joule/authors" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="engineering"/>
diff --git a/buildres/csl/csl-styles/dependent/journal-of-the-american-society-for-mass-spectrometry.csl b/buildres/csl/csl-styles/dependent/journal-of-the-american-society-for-mass-spectrometry.csl
index 2c8b0e267ba..2a7d71218f4 100644
--- a/buildres/csl/csl-styles/dependent/journal-of-the-american-society-for-mass-spectrometry.csl
+++ b/buildres/csl/csl-styles/dependent/journal-of-the-american-society-for-mass-spectrometry.csl
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
-  <!-- Generated with https://github.com/citation-style-language/utilities/tree/master/generate_dependent_styles/data/springer -->
+  <!-- American Chemical Society (ACS), generated from "acs" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Journal of The American Society for Mass Spectrometry</title>
     <id>http://www.zotero.org/styles/journal-of-the-american-society-for-mass-spectrometry</id>
     <link href="http://www.zotero.org/styles/journal-of-the-american-society-for-mass-spectrometry" rel="self"/>
-    <link href="http://www.zotero.org/styles/springer-mathphys-brackets" rel="independent-parent"/>
-    <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/Key_Style_Points_1.0.pdf" rel="documentation"/>
-    <link href="http://www.springer.com/cda/content/document/cda_downloaddocument/manuscript-guidelines-1.0.pdf" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/american-chemical-society" rel="independent-parent"/>
+    <link href="https://publish.acs.org/publish/author_guidelines?coden=jamsef" rel="documentation"/>
     <category citation-format="numeric"/>
+    <category field="chemistry"/>
     <issn>1044-0305</issn>
     <eissn>1879-1123</eissn>
-    <updated>2014-05-15T12:00:00+00:00</updated>
+    <updated>2017-12-31T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/matter.csl b/buildres/csl/csl-styles/dependent/matter.csl
new file mode 100644
index 00000000000..d141af2d9b1
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/matter.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Matter</title>
+    <id>http://www.zotero.org/styles/matter</id>
+    <link href="http://www.zotero.org/styles/matter" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/matter/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="engineering"/>
+    <eissn>2590-2385</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/med.csl b/buildres/csl/csl-styles/dependent/med.csl
new file mode 100644
index 00000000000..376b85fec6a
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/med.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Med</title>
+    <id>http://www.zotero.org/styles/med</id>
+    <link href="http://www.zotero.org/styles/med" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/med/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <eissn>2666-6340</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/molecular-cell.csl b/buildres/csl/csl-styles/dependent/molecular-cell.csl
index 4a91ebadaf2..9bb53473150 100644
--- a/buildres/csl/csl-styles/dependent/molecular-cell.csl
+++ b/buildres/csl/csl-styles/dependent/molecular-cell.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/molecular-cell" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/molecular-cell/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>1097-2765</issn>
     <eissn>1097-4164</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/molecular-therapy-methods-and-clinical-development.csl b/buildres/csl/csl-styles/dependent/molecular-therapy-methods-and-clinical-development.csl
index 41348ff90ee..ed592926ac8 100644
--- a/buildres/csl/csl-styles/dependent/molecular-therapy-methods-and-clinical-development.csl
+++ b/buildres/csl/csl-styles/dependent/molecular-therapy-methods-and-clinical-development.csl
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Molecular Therapy - Methods &amp; Clinical Development</title>
     <id>http://www.zotero.org/styles/molecular-therapy-methods-and-clinical-development</id>
     <link href="http://www.zotero.org/styles/molecular-therapy-methods-and-clinical-development" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
-    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/methods/authors" rel="documentation"/>
     <category citation-format="numeric"/>
+    <category field="science"/>
+    <category field="biology"/>
     <issn>2329-0501</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/molecular-therapy-nucleic-acids.csl b/buildres/csl/csl-styles/dependent/molecular-therapy-nucleic-acids.csl
index f4dbbb2dc0f..2f13af4d37b 100644
--- a/buildres/csl/csl-styles/dependent/molecular-therapy-nucleic-acids.csl
+++ b/buildres/csl/csl-styles/dependent/molecular-therapy-nucleic-acids.csl
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Molecular Therapy - Nucleic Acids</title>
     <id>http://www.zotero.org/styles/molecular-therapy-nucleic-acids</id>
     <link href="http://www.zotero.org/styles/molecular-therapy-nucleic-acids" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
-    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/nucleic-acids/authors" rel="documentation"/>
     <category citation-format="numeric"/>
+    <category field="science"/>
+    <category field="biology"/>
     <issn>2162-2531</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/molecular-therapy-oncolytics.csl b/buildres/csl/csl-styles/dependent/molecular-therapy-oncolytics.csl
index 0d305e55f50..de56f89beab 100644
--- a/buildres/csl/csl-styles/dependent/molecular-therapy-oncolytics.csl
+++ b/buildres/csl/csl-styles/dependent/molecular-therapy-oncolytics.csl
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Molecular Therapy - Oncolytics</title>
     <id>http://www.zotero.org/styles/molecular-therapy-oncolytics</id>
     <link href="http://www.zotero.org/styles/molecular-therapy-oncolytics" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
-    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/oncolytics/authors" rel="documentation"/>
     <category citation-format="numeric"/>
+    <category field="science"/>
+    <category field="biology"/>
     <issn>2372-7705</issn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/molecular-therapy.csl b/buildres/csl/csl-styles/dependent/molecular-therapy.csl
index c8776b07346..ed4b1020f3f 100644
--- a/buildres/csl/csl-styles/dependent/molecular-therapy.csl
+++ b/buildres/csl/csl-styles/dependent/molecular-therapy.csl
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
   <info>
     <title>Molecular Therapy</title>
     <id>http://www.zotero.org/styles/molecular-therapy</id>
     <link href="http://www.zotero.org/styles/molecular-therapy" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
-    <link href="https://www.cell.com/molecular-therapy-family/home" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/molecular-therapy-family/molecular-therapy/authors" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="science"/>
     <category field="biology"/>
     <issn>1525-0016</issn>
     <eissn>1525-0024</eissn>
-    <updated>2018-02-16T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/negative-results.csl b/buildres/csl/csl-styles/dependent/negative-results.csl
index ff91c5f8236..5a47f970f73 100644
--- a/buildres/csl/csl-styles/dependent/negative-results.csl
+++ b/buildres/csl/csl-styles/dependent/negative-results.csl
@@ -5,7 +5,7 @@
     <title-short>Neg Res</title-short>
     <id>http://www.zotero.org/styles/negative-results</id>
     <link href="http://www.zotero.org/styles/negative-results" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/stem-cell-reports" rel="independent-parent"/>
     <link href="http://www.negative-results.org/index.php/instructions-for-authors/#References" rel="documentation"/>
     <category citation-format="author-date"/>
     <category field="science"/>
diff --git a/buildres/csl/csl-styles/dependent/neuron.csl b/buildres/csl/csl-styles/dependent/neuron.csl
index 399d16bfece..d88a2b55a27 100644
--- a/buildres/csl/csl-styles/dependent/neuron.csl
+++ b/buildres/csl/csl-styles/dependent/neuron.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/neuron" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/neuron/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>0896-6273</issn>
     <eissn>1097-4199</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/one-earth.csl b/buildres/csl/csl-styles/dependent/one-earth.csl
index a2720485a3d..3e6dd4c8b6b 100644
--- a/buildres/csl/csl-styles/dependent/one-earth.csl
+++ b/buildres/csl/csl-styles/dependent/one-earth.csl
@@ -5,11 +5,11 @@
     <title>One Earth</title>
     <id>http://www.zotero.org/styles/one-earth</id>
     <link href="http://www.zotero.org/styles/one-earth" rel="self"/>
-    <link href="http://www.zotero.org/styles/cell-numeric-superscript" rel="independent-parent"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="https://www.cell.com/one-earth/author" rel="documentation"/>
     <category citation-format="numeric"/>
     <category field="science"/>
-    <issn>2590-3322</issn>
+    <eissn>2590-3322</eissn>
     <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
diff --git a/buildres/csl/csl-styles/dependent/patterns.csl b/buildres/csl/csl-styles/dependent/patterns.csl
new file mode 100644
index 00000000000..2945c17a4b6
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/patterns.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Patterns</title>
+    <id>http://www.zotero.org/styles/patterns</id>
+    <link href="http://www.zotero.org/styles/patterns" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/patterns/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <eissn>2666-3899</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/star-protocols.csl b/buildres/csl/csl-styles/dependent/star-protocols.csl
new file mode 100644
index 00000000000..fd41c7cd118
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/star-protocols.csl
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>Star Protocols</title>
+    <id>http://www.zotero.org/styles/star-protocols</id>
+    <link href="http://www.zotero.org/styles/star-protocols" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/star-protocols/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="science"/>
+    <eissn>2666-1667</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/dependent/structure.csl b/buildres/csl/csl-styles/dependent/structure.csl
index 3b68e50023f..44f70c7970f 100644
--- a/buildres/csl/csl-styles/dependent/structure.csl
+++ b/buildres/csl/csl-styles/dependent/structure.csl
@@ -7,12 +7,12 @@
     <link href="http://www.zotero.org/styles/structure" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
     <link href="http://www.cell.com/structure/authors" rel="documentation"/>
-    <category citation-format="author-date"/>
+    <category citation-format="numeric"/>
     <category field="biology"/>
     <category field="medicine"/>
     <issn>0969-2126</issn>
     <eissn>1878-4186</eissn>
-    <updated>2016-12-13T12:00:00+00:00</updated>
+    <updated>2017-10-20T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
 </style>
diff --git a/buildres/csl/csl-styles/dependent/the-american-journal-of-human-genetics.csl b/buildres/csl/csl-styles/dependent/the-american-journal-of-human-genetics.csl
new file mode 100644
index 00000000000..f0570c90b1c
--- /dev/null
+++ b/buildres/csl/csl-styles/dependent/the-american-journal-of-human-genetics.csl
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" default-locale="en-US">
+  <!-- Cell Press - Research Journals, generated from "cell-press-research" metadata at https://github.com/citation-style-language/journals -->
+  <info>
+    <title>The American Journal of Human Genetics</title>
+    <id>http://www.zotero.org/styles/the-american-journal-of-human-genetics</id>
+    <link href="http://www.zotero.org/styles/the-american-journal-of-human-genetics" rel="self"/>
+    <link href="http://www.zotero.org/styles/cell" rel="independent-parent"/>
+    <link href="https://www.cell.com/ajhg/authors" rel="documentation"/>
+    <category citation-format="numeric"/>
+    <category field="biology"/>
+    <issn>0002-9297</issn>
+    <eissn>1537-6605</eissn>
+    <updated>2017-10-20T12:00:00+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+</style>
diff --git a/buildres/csl/csl-styles/geographical-analysis.csl b/buildres/csl/csl-styles/geographical-analysis.csl
new file mode 100644
index 00000000000..7c8e38b8c13
--- /dev/null
+++ b/buildres/csl/csl-styles/geographical-analysis.csl
@@ -0,0 +1,180 @@
+<?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="sort-only" page-range-format="minimal-two" default-locale="en-US">
+  <info>
+    <title>Geographical Analysis</title>
+    <title-short>GEAN</title-short>
+    <id>http://www.zotero.org/styles/geographical-analysis</id>
+    <link href="http://www.zotero.org/styles/geographical-analysis" rel="self"/>
+    <link href="http://www.zotero.org/styles/environment-and-planning" rel="template"/>
+    <link href="https://onlinelibrary.wiley.com/page/journal/15384632/homepage/forauthors.html" rel="documentation"/>
+    <author>
+      <name>Yigong Hu</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="geography"/>
+    <issn>0016-7363</issn>
+    <summary>Style for the Geographical Analysis journal</summary>
+    <updated>2015-01-10T18:11:11+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">
+    <style-options punctuation-in-quote="true"/>
+    <terms>
+      <term name="editor" form="verb-short">edited by</term>
+      <term name="editor" form="short">
+        <single>ed</single>
+        <multiple>eds</multiple>
+      </term>
+      <term name="in">In</term>
+      <term name="edition">ed.</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor" delimiter="," suffix=".">
+      <label form="verb-short" suffix=" "/>
+      <name sort-separator=", " and="text" initialize-with="." delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with=". " delimiter=", " and="text"/>
+      <label form="short" prefix=" "/>
+      <substitute>
+        <names variable="editor"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with="."/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book thesis" match="any">
+        <text variable="title" font-style="italic" suffix=". "/>
+      </if>
+      <else>
+        <text variable="title" quotes="true" suffix=". "/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <choose>
+      <if type="book chapter" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </if>
+      <else-if type="paper-conference" match="any">
+        <group delimiter=": ">
+          <text variable="publisher-place"/>
+          <text variable="publisher"/>
+        </group>
+      </else-if>
+      <else-if type="report thesis" match="any">
+        <group delimiter=", ">
+          <text variable="publisher"/>
+          <text variable="publisher-place"/>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="year-date">
+    <date variable="issued">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator">
+    <group delimiter=" ">
+      <label variable="locator"/>
+      <text variable="locator"/>
+    </group>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" collapse="year">
+    <sort>
+      <key macro="author-short"/>
+      <key macro="year-date" sort="ascending"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <text macro="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography hanging-indent="true" et-al-min="4" et-al-use-first="1">
+    <sort>
+      <key macro="author"/>
+      <key macro="year-date"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=". ">
+        <group>
+          <group delimiter=". " suffix=". ">
+            <text macro="author"/>
+            <date variable="issued" prefix="(" suffix=")">
+              <date-part name="year"/>
+            </date>
+          </group>
+          <text macro="title"/>
+          <choose>
+            <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text macro="edition"/>
+                  <text macro="editor"/>
+                </group>
+                <text macro="publisher" suffix="."/>
+              </group>
+            </if>
+            <else-if type="chapter paper-conference" match="any">
+              <text term="in"/>
+              <group prefix=" " delimiter=". ">
+                <group delimiter=", ">
+                  <text variable="container-title" font-style="italic"/>
+                  <text macro="edition"/>
+                  <text variable="page"/>
+                  <text macro="editor"/>
+                </group>
+                <text macro="publisher" suffix="."/>
+              </group>
+            </else-if>
+            <else>
+              <group prefix=" " suffix=".">
+                <text variable="container-title" font-style="italic"/>
+                <group prefix=" ">
+                  <text variable="volume"/>
+                  <text variable="issue" prefix="(" suffix=")"/>
+                </group>
+                <text prefix=", " variable="page"/>
+              </group>
+            </else>
+          </choose>
+        </group>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/isara-iso-690.csl b/buildres/csl/csl-styles/isara-iso-690.csl
new file mode 100644
index 00000000000..115558fcbad
--- /dev/null
+++ b/buildres/csl/csl-styles/isara-iso-690.csl
@@ -0,0 +1,570 @@
+<?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" default-locale="fr-FR">
+  <info>
+    <title>Isara - ISO-690 (auteur-date, français)</title>
+    <id>http://www.zotero.org/styles/isara-iso-690</id>
+    <link href="http://www.zotero.org/styles/isara-iso-690" rel="self"/>
+    <link href="http://www.zotero.org/styles/iso690-author-date-fr-no-abstract" rel="template"/>
+    <link href="https://doc.isara.fr/se-former/guide-de-referencement-bibliographique/" rel="documentation"/>
+    <author>
+      <name>Oriane Debiez</name>
+      <email>lasource@isara.fr</email>
+    </author>
+    <author>
+      <name>Vincent Payet</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <summary>Style based on ISO 690:2010(F), V1, derived from Mellifluo, Grolimund, Hardegger and Giraud version.</summary>
+    <updated>2022-08-31T02:31:25+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>
+    <terms>
+      <term name="no date">[sans date]</term>
+      <term name="in">in</term>
+      <term name="online">en&#160;ligne</term>
+      <term name="accessed">consulté&#160;le</term>
+      <term name="retrieved">disponible</term>
+      <term name="from">à l'adresse</term>
+      <term name="translator" form="short">trad.</term>
+      <term name="editor" form="short">éd.</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor">
+      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <label prefix=" (" form="short" suffix=".)"/>
+    </names>
+  </macro>
+  <macro name="translator">
+    <names variable="translator">
+      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <label prefix=" (" form="short" suffix=".)"/>
+    </names>
+  </macro>
+  <macro name="year-date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else>
+        <text term="no date"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="responsibility">
+    <names variable="author">
+      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+      <substitute>
+        <text macro="editor"/>
+        <text macro="translator"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+    <choose>
+      <if variable="author editor translator" match="any">
+        <text macro="year-date" prefix=", "/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="author-citation">
+    <names variable="author">
+      <name form="short"/>
+      <et-al font-style="italic"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title" font-style="italic" prefix="[Auteur ?] "/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="container-author">
+    <names variable="container-author">
+      <name and="text" name-as-sort-order="all" sort-separator=", " delimiter=", " delimiter-precedes-last="never">
+        <name-part name="family" text-case="uppercase"/>
+      </name>
+    </names>
+  </macro>
+  <macro name="container-responsibility">
+    <choose>
+      <if variable="container-author editor translator" match="any">
+        <choose>
+          <if variable="container-author">
+            <text macro="container-author"/>
+          </if>
+          <else-if variable="editor">
+            <text macro="editor"/>
+          </else-if>
+          <else>
+            <text macro="translator"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book thesis map motion_picture song manuscript" match="any">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic" prefix="[Auteur ?] " suffix=", "/>
+            <text macro="year-date" suffix=". "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="paper-conference speech chapter article-journal article-magazine article-newspaper entry entry-dictionary entry-encyclopedia post-weblog post webpage broadcast" match="any">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <text variable="title" suffix=". "/>
+          </if>
+          <else>
+            <text macro="year-date" prefix="[Auteur ?], " suffix=". "/>
+            <text variable="title" suffix=". "/>
+          </else>
+        </choose>
+        <choose>
+          <if type="chapter paper-conference" match="any">
+            <text term="in" text-case="capitalize-first" suffix="&#160;: "/>
+          </if>
+        </choose>
+        <choose>
+          <if variable="container-author editor translator" match="any">
+            <text macro="container-responsibility"/>
+            <choose>
+              <if variable="container-title event" match="any">
+                <text value=", "/>
+              </if>
+            </choose>
+          </if>
+        </choose>
+        <choose>
+          <if variable="container-title">
+            <text variable="container-title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="event" font-style="italic"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="report">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <text variable="number" suffix="&#160;: "/>
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="number" suffix="&#160;: "/>
+            <text variable="title" font-style="italic" prefix="[Auteur ?] " suffix=", "/>
+            <text macro="year-date" suffix=". "/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="patent">
+        <choose>
+          <if variable="author editor translator" match="any">
+            <text variable="title"/>
+          </if>
+          <else>
+            <text variable="title" prefix="[Auteur ?] " suffix=", "/>
+            <text macro="year-date" suffix=". "/>
+          </else>
+        </choose>
+      </else-if>
+      <else>
+        <choose>
+          <if variable="author editor translator" match="any">
+            <text variable="title" font-style="italic"/>
+          </if>
+          <else>
+            <text variable="title" font-style="italic" prefix="[Auteur ?] " suffix=", "/>
+            <text macro="year-date" suffix=". "/>
+          </else>
+        </choose>
+      </else>
+    </choose>
+    <choose>
+      <if variable="URL">
+        <text term="online" prefix=" [" suffix="]"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="number">
+    <text variable="number"/>
+  </macro>
+  <macro name="medium">
+    <text variable="medium" prefix=" [" suffix="]"/>
+  </macro>
+  <macro name="genre">
+    <choose>
+      <if type="map">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" prefix="[" suffix="]"/>
+          </if>
+          <else>
+            <text value="carte" prefix="[" suffix="]"/>
+          </else>
+        </choose>
+      </if>
+      <else>
+        <text variable="genre"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="day" suffix=" "/>
+          <date-part name="month" suffix=" "/>
+          <date-part name="year"/>
+        </date>
+      </if>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <text variable="edition" form="long"/>
+  </macro>
+  <macro name="publisher-group">
+    <group delimiter="&#160;: ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="issue">
+    <group delimiter=", ">
+      <text variable="volume" prefix="Vol.&#160;"/>
+      <choose>
+        <if variable="volume">
+          <text variable="issue" prefix="n°&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
+        </if>
+        <else-if variable="issue">
+          <text variable="issue" prefix="N°&#160;"/>
+          <text variable="page" prefix="pp.&#160;"/>
+        </else-if>
+        <else>
+          <text variable="page" prefix="pp.&#160;"/>
+        </else>
+      </choose>
+    </group>
+  </macro>
+  <macro name="accessed">
+    <choose>
+      <if variable="URL">
+        <group prefix=" [" suffix="]">
+          <text term="accessed" text-case="capitalize-first"/>
+          <date variable="accessed">
+            <date-part name="day" prefix="&#160;"/>
+            <date-part name="month" prefix="&#160;"/>
+            <date-part name="year" prefix="&#160;"/>
+          </date>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection">
+    <group delimiter=", ">
+      <text variable="collection-title"/>
+      <text variable="collection-number"/>
+    </group>
+  </macro>
+  <macro name="page">
+    <choose>
+      <if type="book thesis manuscript" match="any">
+        <text variable="number-of-pages" suffix="&#160;p"/>
+      </if>
+      <else-if type="chapter paper-conference article-newspaper" match="any">
+        <text variable="page" prefix="pp.&#160;"/>
+      </else-if>
+      <else-if type="report patent" match="any">
+        <text variable="page" suffix="&#160;p"/>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="isbn">
+    <text variable="ISBN" prefix="ISBN&#160;"/>
+  </macro>
+  <macro name="doi">
+    <text variable="DOI" prefix="DOI&#160;"/>
+  </macro>
+  <macro name="url">
+    <choose>
+      <if variable="URL">
+        <group>
+          <text term="retrieved" suffix=" " text-case="capitalize-first"/>
+          <text term="from" suffix="&#160;: "/>
+          <text variable="URL"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="archive">
+    <group delimiter=":&#160;">
+      <text variable="archive"/>
+      <text macro="archive_location"/>
+    </group>
+  </macro>
+  <macro name="archive_location">
+    <choose>
+      <if variable="archive_location">
+        <text variable="archive_location"/>
+      </if>
+      <else>
+        <text variable="call-number"/>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" collapse="year" year-suffix-delimiter=", " after-collapse-delimiter="; ">
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=", ">
+          <text macro="author-citation"/>
+          <text macro="year-date"/>
+        </group>
+        <group>
+          <label variable="locator" suffix=".&#160;" form="short" strip-periods="true"/>
+          <text variable="locator"/>
+        </group>
+      </group>
+    </layout>
+  </citation>
+  <bibliography>
+    <sort>
+      <key macro="responsibility"/>
+      <key macro="year-date"/>
+    </sort>
+    <layout>
+      <choose>
+        <if type="book map" match="any">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="genre" suffix=". "/>
+            <text macro="edition" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="isbn" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </if>
+        <else-if type="article-journal article-magazine" match="any">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="edition" suffix=". "/>
+            <text macro="date" suffix=". "/>
+            <text macro="issue" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="doi" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="edition" suffix=". "/>
+            <text macro="publisher-group" suffix=", "/>
+            <text macro="date" suffix=". "/>
+            <text macro="page" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="chapter entry entry-dictionary entry-encyclopedia" match="any">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="edition" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="page" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="isbn" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="speech">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="genre" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="date" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="page" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="paper-conference">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="genre" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="date" suffix=". "/>
+            <text macro="page" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="isbn" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="thesis">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="genre" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="post-weblog post webpage" match="any">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="date" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="broadcast motion_picture song" match="any">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="medium" suffix=". "/>
+            <text macro="publisher-group" suffix=", "/>
+            <text macro="date" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="isbn" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="report">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="genre" suffix=". "/>
+            <text macro="edition" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="manuscript">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="genre" suffix=". "/>
+            <text macro="edition" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else-if type="patent">
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="number" suffix=". "/>
+            <text macro="date" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else-if>
+        <else>
+          <group>
+            <text macro="responsibility" suffix=". "/>
+            <choose>
+              <if variable="author editor translator" match="any">
+                <text macro="title" suffix=". "/>
+              </if>
+            </choose>
+            <text macro="medium" suffix=". "/>
+            <text macro="genre" suffix=". "/>
+            <text macro="date" suffix=". "/>
+            <text macro="edition" suffix=". "/>
+            <text macro="publisher-group" suffix=". "/>
+            <text macro="number" suffix=". "/>
+            <text macro="accessed" suffix=". "/>
+            <text macro="collection" suffix=". "/>
+            <text macro="page" suffix=". "/>
+            <text macro="isbn" suffix=". "/>
+            <text macro="url"/>
+          </group>
+        </else>
+      </choose>
+      <group display="right-inline">
+        <text macro="archive"/>
+      </group>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/law-citation-manual.csl b/buildres/csl/csl-styles/law-citation-manual.csl
index b8512c5c40f..0fcc613cfc7 100644
--- a/buildres/csl/csl-styles/law-citation-manual.csl
+++ b/buildres/csl/csl-styles/law-citation-manual.csl
@@ -1,250 +1,494 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="note" delimiter-precedes-last="always" demote-non-dropping-particle="never" initialize-with=" " name-delimiter=", " names-delimiter=". " name-as-sort-order="all" sort-separator=" " default-locale="zh-CN">
-  <!-- 半成品，需要更多的文献类型测试，有需要请提供 -->
+<style xmlns="http://purl.org/net/xbiblio/csl" class="note" version="1.0" initialize-with=". " demote-non-dropping-particle="sort-only" default-locale="zh-CN">
   <info>
-    <title>Law Citation Manual (中法学注引手册, 中文)</title>
-    <title-short>Chinese Law Journal (note)</title-short>
+    <title>Manual of Legal Citation (法学注引手册, 中文)</title>
     <id>http://www.zotero.org/styles/law-citation-manual</id>
     <link href="http://www.zotero.org/styles/law-citation-manual" rel="self"/>
-    <link href="http://www.zotero.org/styles/china-national-standard-gb-t-7714-2015-note" rel="template"/>
-    <link href="https://www.weibo.com/ttarticle/p/show?id=2309404436112734027798" rel="documentation"/>
+    <link href="http://www.zotero.org/styles/bluebook-law-review" rel="template"/>
+    <link href="https://www.pup.cn/bookDetail?id=910497ac470d4880ab56c6709bb1d7c5" rel="documentation"/>
     <link href="https://colr.xmu.edu.cn/_upload/article/files/67/3c/bdf817f64039947a52276727ef01/082c41aa-fed1-4460-97fa-7f471901a879.pdf" rel="documentation"/>
     <author>
-      <name>韩小土</name>
-      <email>redleafnew@163.com</email>
+      <name>Zeping Lee</name>
+      <email>zepinglee@gmail.com</email>
     </author>
-    <contributor>
-      <name>牛耕田</name>
-      <email>buffalo_d@163.com</email>
-    </contributor>
     <category citation-format="note"/>
     <category field="law"/>
-    <summary>中国法学引注</summary>
-    <updated>2021-03-09T00:44:28+00:00</updated>
+    <updated>2022-09-06T12:51:00+08: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="zh-CN">
+  <locale xml:lang="en">
+    <date form="text" delimiter=" ">
+      <date-part name="day"/>
+      <date-part name="month"/>
+      <date-part name="year"/>
+    </date>
     <terms>
-      <term name="anonymous">佚名</term>
-      <term name="edition">版</term>
-      <term name="page" form="short">
-        <single>p.</single>
-        <multiple>pp.</multiple>
-      </term>
-      <!-- <term name="container-author" form="verb-short">著</term> 等修改-->
+      <term name="accessed">last visited</term>
+      <term name="page" form="short">p.</term>
     </terms>
   </locale>
-  <macro name="accessed-date">
-    <date variable="accessed" delimiter="" prefix="" suffix="">
-      <date-part name="year" suffix="年"/>
-      <date-part name="month" form="numeric" suffix="月"/>
-      <date-part name="day" suffix="日"/>
+  <locale xml:lang="zh">
+    <date form="text">
+      <date-part name="year" suffix="年" range-delimiter="&#8212;"/>
+      <date-part name="month" form="numeric" suffix="月" range-delimiter="&#8212;"/>
+      <date-part name="day" suffix="日" range-delimiter="&#8212;"/>
     </date>
+    <terms>
+      <term name="article-locator" form="short">条</term>
+      <term name="accessed">访问</term>
+      <term name="compiler">整理</term>
+      <term name="compiler" form="short">整理</term>
+      <term name="edition" form="short">版</term>
+      <term name="editor" form="short">主编</term>
+      <term name="ibid">同上注</term>
+      <term name="in">载</term>
+      <term name="op-cit">同前注</term>
+      <term name="page" form="short">页</term>
+      <term name="paragraph" form="short">款</term>
+      <term name="rule" form="short">条</term>
+      <term name="section" form="short">条</term>
+      <term name="open-quote">“</term>
+      <term name="close-quote">”</term>
+      <term name="open-inner-quote">‘</term>
+      <term name="close-inner-quote">’</term>
+    </terms>
+  </locale>
+  <locale>
+    <style-options punctuation-in-quote="false"/>
+    <terms>
+      <term name="page-range-delimiter">-</term>
+    </terms>
+  </locale>
+  <macro name="author-zh">
+    <names variable="author">
+      <name delimiter="、" delimiter-precedes-et-al="never"/>
+      <label form="short"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <!-- 略写文献时，标示文献性质的“编”“主编”等可以省略 -->
+  <macro name="author-short-zh">
+    <names variable="author">
+      <name delimiter="、" delimiter-precedes-et-al="never"/>
+      <substitute>
+        <names variable="editor"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="access-zh">
+    <choose>
+      <if variable="URL">
+        <group delimiter="，">
+          <text variable="URL"/>
+          <choose>
+            <!-- 一般不要求注明“访问日期”。网页没有显示上传日期的，引用时可以标注最后访问日期 -->
+            <if variable="issued" match="none">
+              <group>
+                <date variable="accessed" form="text"/>
+                <text term="accessed"/>
+              </group>
+            </if>
+          </choose>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="source-zh">
+    <group delimiter="：">
+      <text macro="author-zh"/>
+      <choose>
+        <if type="article-journal article-magazine" match="any">
+          <group delimiter="，">
+            <text macro="title-zh"/>
+            <text macro="secondary-contributor-zh"/>
+            <text macro="container-zh"/>
+            <text macro="locator-zh"/>
+          </group>
+        </if>
+        <else-if type="article-newspaper">
+          <group delimiter="，">
+            <text macro="title-zh"/>
+            <text macro="secondary-contributor-zh"/>
+            <text macro="container-zh"/>
+            <text macro="locator-or-page-zh"/>
+          </group>
+        </else-if>
+        <else-if type="chapter paper-conference" match="any">
+          <group delimiter="，">
+            <text macro="title-zh"/>
+            <text macro="secondary-contributor-zh"/>
+            <text macro="container-zh"/>
+            <text macro="publisher-zh"/>
+            <text macro="locator-zh"/>
+          </group>
+        </else-if>
+        <else-if type="book thesis" match="any">
+          <group delimiter="，">
+            <text macro="title-zh"/>
+            <text macro="secondary-contributor-zh"/>
+            <text macro="publisher-zh"/>
+            <text macro="locator-zh"/>
+          </group>
+        </else-if>
+        <!-- 49. 引用个人博客、微信公众号 -->
+        <else-if type="post post-weblog webpage">
+          <group delimiter="，">
+            <text macro="title-zh"/>
+            <text macro="container-zh"/>
+            <text macro="access-zh"/>
+          </group>
+        </else-if>
+        <!-- (四)引用法律文件 -->
+        <else-if type="legislation">
+          <group delimiter="，">
+            <group>
+              <text macro="title-zh"/>
+              <choose>
+                <!-- 优先使用 locator 的条文序号 -->
+                <if variable="locator">
+                  <text macro="locator-zh"/>
+                </if>
+                <else>
+                  <text macro="section-zh"/>
+                </else>
+              </choose>
+            </group>
+            <text variable="number"/>
+            <group>
+              <text macro="issuance-zh"/>
+              <text value="发布"/>
+            </group>
+          </group>
+        </else-if>
+        <!-- (五)引用司法案例 -->
+        <else-if type="legal_case">
+          <group delimiter="，">
+            <text macro="title-zh"/>
+            <choose>
+              <if variable="container-title">
+                <choose>
+                  <if variable="number">
+                    <!-- 指导性案例 -->
+                    <group>
+                      <text macro="container-zh"/>
+                      <choose>
+                        <if is-numeric="number">
+                          <number variable="number"/>
+                          <text value="号"/>
+                        </if>
+                        <else>
+                          <text variable="number"/>
+                        </else>
+                      </choose>
+                      <text macro="issuance-zh" prefix="（" suffix="）"/>
+                    </group>
+                  </if>
+                  <else>
+                    <!-- 《最高人民法院公报》上的案例 -->
+                    <text macro="container-zh"/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <group delimiter="，">
+                  <group>
+                    <text variable="authority"/>
+                    <choose>
+                      <if variable="genre">
+                        <!-- 用户需要在 genre 中填写司法案例的文书名称，如“民事判决书”、“行政判决书” -->
+                        <text variable="genre"/>
+                      </if>
+                      <else>
+                        <text value="判决书"/>
+                      </else>
+                    </choose>
+                    <text variable="number"/>
+                  </group>
+                  <text macro="issuance-zh"/>
+                </group>
+              </else>
+            </choose>
+          </group>
+        </else-if>
+        <else>
+          <group delimiter="，">
+            <text macro="title-zh"/>
+            <text macro="container-zh"/>
+            <text macro="publisher-zh"/>
+            <text macro="locator-zh"/>
+          </group>
+        </else>
+      </choose>
+    </group>
   </macro>
-  <macro name="author">
+  <macro name="title-zh">
     <choose>
-      <if variable="author">
-        <names variable="author">
-          <name>
-            <name-part name="family" text-case="uppercase"/>
-            <name-part name="given"/>
-          </name>
-        </names>
+      <if type="webpage">
+        <choose>
+          <if variable="container-title">
+            <text variable="title" prefix="《" suffix="》"/>
+          </if>
+          <else>
+            <text variable="title"/>
+          </else>
+        </choose>
       </if>
+      <else-if type="legal_case">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" prefix="《" suffix="》"/>
+      </else>
     </choose>
+    <text macro="edition-zh" prefix="（" suffix="）"/>
   </macro>
-  <macro name="container-author">
-    <names variable="container-author reviewed-author">
-      <name>
-        <name-part name="family" text-case="uppercase"/>
-        <name-part name="given"/>
-      </name>
+  <!-- 其他贡献者(翻译、 整理、校对) -->
+  <macro name="secondary-contributor-zh">
+    <names variable="translator" delimiter="，">
+      <name delimiter="、"/>
+      <label form="short"/>
+      <substitute>
+        <names variable="compiler"/>
+      </substitute>
     </names>
   </macro>
-  <macro name="edition">
+  <macro name="edition-zh">
     <choose>
-      <if variable="edition">
-        <group delimiter=" ">
-          <text variable="edition"/>
-          <text term="edition"/>
-        </group>
+      <if is-numeric="edition">
+        <text value="第"/>
+        <number variable="edition"/>
+        <label variable="edition" form="short"/>
       </if>
+      <else>
+        <text variable="edition"/>
+      </else>
     </choose>
   </macro>
-  <macro name="editor">
-    <names variable="editor translator">
-      <name>
-        <name-part name="family" text-case="uppercase"/>
-        <name-part name="given"/>
-      </name>
-      <label form="verb-short" prefix=", "/>
+  <macro name="editor-zh">
+    <names variable="editor">
+      <name delimiter="、"/>
+      <label form="short"/>
     </names>
   </macro>
-  <macro name="issued-date">
-    <!--中文年月日  -->
+  <macro name="container-zh">
     <choose>
-      <if variable="issued">
-        <date variable="issued" delimiter="">
-          <date-part name="year" suffix="年"/>
-          <date-part name="month" form="numeric" suffix="月"/>
-          <date-part name="day" suffix="日"/>
-        </date>
+      <if type="article-journal article-magazine" match="any">
+        <text term="in"/>
+        <text variable="container-title" prefix="《" suffix="》"/>
+        <text macro="issuance-zh"/>
+        <text macro="issue-zh"/>
       </if>
+      <else-if type="chapter paper-conference" match="any">
+        <text term="in"/>
+        <group delimiter="：">
+          <text macro="editor-zh"/>
+          <text variable="container-title" prefix="《" suffix="》"/>
+        </group>
+        <text macro="volume-zh"/>
+        <text macro="issue-zh"/>
+      </else-if>
+      <else-if type="legal_case">
+        <choose>
+          <if variable="number">
+            <!-- 指导性案例 -->
+            <text variable="container-title"/>
+          </if>
+          <else>
+            <!-- 《最高人民法院公报》 -->
+            <text term="in"/>
+            <text variable="container-title" prefix="《" suffix="》"/>
+            <text macro="issuance-zh"/>
+            <text macro="issue-zh"/>
+          </else>
+        </choose>
+      </else-if>
+      <else-if type="article-newspaper">
+        <text term="in"/>
+        <text variable="container-title" prefix="《" suffix="》"/>
+        <text macro="issuance-zh"/>
+      </else-if>
+      <else-if type="post post-weblog webpage">
+        <!-- 2020 年版的网络文献和微信公众号文章的网站标题与上传日期之间均无逗号 -->
+        <text term="in"/>
+        <text variable="container-title"/>
+        <text macro="issuance-zh"/>
+      </else-if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text term="in"/>
+        <text variable="container-title" prefix="《" suffix="》"/>
       </else>
     </choose>
   </macro>
-  <macro name="issue-date-year">
+  <macro name="volume-zh">
     <choose>
-      <if variable="issued">
-        <date variable="issued" date-parts="year" form="numeric"/>
+      <if is-numeric="volume">
+        <text value="第"/>
+        <number variable="volume"/>
+        <label variable="volume" form="short"/>
       </if>
       <else>
-        <text term="no date" prefix="[" suffix="]"/>
+        <text variable="volume"/>
       </else>
     </choose>
   </macro>
-  <macro name="publishing">
+  <macro name="issue-zh">
     <choose>
-      <if variable="publisher">
-        <group delimiter=": ">
-          <group delimiter="">
-            <text variable="publisher" prefix="，"/>
-            <text macro="issue-date-year" suffix="年版"/>
-          </group>
-        </group>
+      <if is-numeric="issue">
+        <text value="第"/>
+        <number variable="issue"/>
         <choose>
-          <if variable="locator">
-            <text variable="locator" prefix=": "/>
+          <if type="chapter paper-conference" match="any">
+            <text value="辑"/>
           </if>
           <else>
-            <text variable="page" prefix=": "/>
+            <label variable="issue" form="short"/>
           </else>
         </choose>
       </if>
+      <else>
+        <text variable="issue"/>
+      </else>
     </choose>
   </macro>
-  <macro name="serial-information">
-    <group delimiter="">
-      <text macro="issue-date-year" suffix="年"/>
-    </group>
-    <text variable="issue" prefix="第" suffix="期"/>
-    <text variable="page" prefix="第" suffix="页"/>
+  <!-- 条文序号 -->
+  <macro name="section-zh">
+    <choose>
+      <if is-numeric="section">
+        <text value="第"/>
+        <number variable="section"/>
+        <label variable="section"/>
+      </if>
+      <else>
+        <text variable="section"/>
+      </else>
+    </choose>
   </macro>
-  <macro name="title">
-    <text variable="title" text-case="title" prefix="《" suffix="》"/>
+  <macro name="publisher-zh">
+    <text variable="publisher"/>
+    <choose>
+      <if type="post webpage">
+        <text macro="issuance-zh"/>
+      </if>
+      <else>
+        <text macro="issuance-zh"/>
+        <choose>
+          <if type="thesis">
+            <choose>
+              <if variable="genre">
+                <text variable="genre"/>
+              </if>
+              <else>
+                <text value="博士学位论文"/>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text term="edition" form="short"/>
+          </else>
+        </choose>
+      </else>
+    </choose>
   </macro>
-  <macro name="full-contents">
-    <text macro="author" suffix="："/>
-    <text macro="title"/>
+  <macro name="issuance-zh">
     <choose>
-      <if type="book bill chapter legislation paper-conference report" match="any">
-        <text macro="editor" prefix="，载"/>
+      <if type="article-magazine article-newspaper legal_case legislation post post-weblog webpage" match="any">
+        <date variable="issued" form="text"/>
+      </if>
+      <else>
+        <date variable="issued" form="text" date-parts="year"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="locator-zh">
+    <choose>
+      <if is-numeric="locator">
+        <text value="第"/>
+        <text variable="locator"/>
         <choose>
-          <if variable="container-title">
-            <text value="//"/>
-            <text macro="container-author" suffix="："/>
-            <text variable="container-title" text-case="title" prefix="《" suffix="》"/>
+          <if locator="page" type="article-newspaper" match="all">
+            <text value="版"/>
           </if>
           <else>
-            <text value=". "/>
+            <label variable="locator" form="short"/>
           </else>
         </choose>
-        <text macro="edition" suffix="。"/>
-        <text macro="publishing"/>
       </if>
-      <else-if type="article-journal article-magazine" match="any">
-        <group prefix="：">
-          <choose>
-            <if variable="container-title">
-              <text variable="container-title" text-case="title" prefix="载《" suffix="》"/>
-              <text macro="serial-information" prefix=""/>
-              <!--年前的前辍-->
-            </if>
-            <else>
-              <text macro="serial-information" suffix=". "/>
-              <text macro="publishing"/>
-            </else>
-          </choose>
-        </group>
-      </else-if>
-      <else-if type="article-newspaper">
-        <!-- 报纸-->
-        <group prefix="，">
-          <choose>
-            <if variable="container-title">
-              <text variable="container-title" text-case="title" prefix="载《" suffix="》"/>
-              <text macro="issued-date" prefix=""/>
-              <text variable="page" prefix="第" suffix="页"/>
-            </if>
-            <else>
-              <text macro="issued-date" suffix=". "/>
-              <text macro="publishing"/>
-            </else>
-          </choose>
-        </group>
+      <else>
+        <text variable="locator"/>
+      </else>
+    </choose>
+  </macro>
+  <!-- 报纸的出版信息，一般注明年、月、日;必要时，注明版次。 -->
+  <macro name="locator-or-page-zh">
+    <choose>
+      <if variable="locator">
+        <text macro="locator-zh"/>
+      </if>
+      <else-if variable="page" type="article-newspaper" match="all">
+        <choose>
+          <if is-numeric="page">
+            <text value="第"/>
+            <text variable="page"/>
+            <text value="版"/>
+          </if>
+          <else>
+            <text variable="page"/>
+          </else>
+        </choose>
       </else-if>
-      <!-- 报纸-->
-      <else-if type="thesis">
-        <!--学位论文-->
-        <group prefix="，">
-          <choose>
-            <if variable="container-title">
-              <text variable="container-title" text-case="title" prefix="载《" suffix="》"/>
-            </if>
-            <else>
-              <group delimiter="">
-                <text variable="publisher"/>
-                <text macro="issue-date-year" suffix="年"/>
-                <text variable="genre" suffix="学位论文"/>
-              </group>
-              <!--  <text macro="publishing"/>-->
-            </else>
-          </choose>
-        </group>
+    </choose>
+  </macro>
+  <macro name="citation-layout-zh">
+    <choose>
+      <if position="ibid-with-locator">
+        <text term="ibid"/>
+        <text macro="locator-zh" prefix="，"/>
+      </if>
+      <else-if position="ibid">
+        <text term="ibid"/>
       </else-if>
-      <!--学位论文-->
-      <else-if type="webpage">
-        <!--网页文献-->
+      <else-if position="subsequent">
         <choose>
-          <if variable="issued">
-            <text macro="issued-date" prefix="，"/>
+          <if disambiguate="true">
+            <group delimiter="，">
+              <text variable="first-reference-note-number" prefix="同前注〔" suffix="〕"/>
+              <group delimiter="：">
+                <text macro="author-short-zh"/>
+                <text variable="title" form="short" prefix="《" suffix="》"/>
+              </group>
+              <text macro="locator-zh"/>
+            </group>
           </if>
+          <else>
+            <group delimiter="，">
+              <text term="op-cit"/>
+              <text macro="author-short-zh" suffix="书"/>
+              <text macro="locator-zh"/>
+            </group>
+          </else>
         </choose>
-        <text variable="URL" prefix="，"/>
-        <text macro="accessed-date" prefix="，" suffix="访问"/>
       </else-if>
       <else>
-        <text macro="publishing" prefix="，"/>
-        <text macro="issued-date" prefix="" suffix=""/>
+        <text macro="source-zh"/>
       </else>
     </choose>
   </macro>
-  <citation et-al-min="4" et-al-use-first="3" disambiguate-add-names="true">
-    <layout suffix="。" delimiter="; ">
-      <choose>
-        <if position="ibid-with-locator">
-          <text term="ibid"/>
-          <label variable="locator" form="short"/>
-          <text variable="locator"/>
-        </if>
-        <else-if position="ibid">
-          <text term="ibid"/>
-        </else-if>
-        <else-if position="subsequent">
-          <text macro="full-contents"/>
-        </else-if>
-        <else>
-          <text macro="full-contents"/>
-        </else>
-      </choose>
+  <macro name="citation-number">
+    <text variable="citation-number" prefix="〔" suffix="〕"/>
+  </macro>
+  <!-- 作者人数为三人或者三人以上的，原则上第一次列明全部，再次引用时可以只列第一作者，后加“等”。 -->
+  <!-- 作者人数众多，不便全部列明的，可以根据情况列 1-2 个，后面加“等”。 -->
+  <citation et-al-min="6" et-al-use-first="2" et-al-subsequent-min="3" et-al-subsequent-use-first="1">
+    <layout suffix="。" delimiter="；">
+      <text macro="citation-layout-zh"/>
     </layout>
   </citation>
-  <bibliography entry-spacing="0" et-al-min="4" et-al-use-first="3" line-spacing="1" second-field-align="flush">
+  <bibliography second-field-align="flush" et-al-min="6" et-al-use-first="2">
     <layout suffix="。">
-      <text variable="citation-number" prefix="〔" suffix="〕"/>
-      <text macro="full-contents"/>
+      <text macro="citation-number"/>
+      <text macro="source-zh"/>
     </layout>
   </bibliography>
 </style>
diff --git a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
index 335fa944a16..1a9517a9f90 100644
--- a/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
+++ b/buildres/csl/csl-styles/norsk-henvisningsstandard-for-rettsvitenskapelige-tekster.csl
@@ -95,7 +95,7 @@
         <text quotes="true" variable="title"/>
       </if>
       <else-if type="legislation">
-        <text variable="title-short"/>
+        <text variable="title-short" text-case="capitalize-first"/>
       </else-if>
       <else>
         <text font-style="italic" variable="title-short"/>
diff --git a/buildres/csl/csl-styles/proceedings-of-the-estonian-academy-of-sciences-author-date.csl b/buildres/csl/csl-styles/proceedings-of-the-estonian-academy-of-sciences-author-date.csl
new file mode 100644
index 00000000000..2610b385cae
--- /dev/null
+++ b/buildres/csl/csl-styles/proceedings-of-the-estonian-academy-of-sciences-author-date.csl
@@ -0,0 +1,222 @@
+<?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="sort-only" default-locale="en-US">
+  <info>
+    <title>Proceedings of the Estonian Academy of Sciences (author-date)</title>
+    <title-short>PEAS</title-short>
+    <id>http://www.zotero.org/styles/proceedings-of-the-estonian-academy-of-sciences-author-date</id>
+    <link href="http://www.zotero.org/styles/proceedings-of-the-estonian-academy-of-sciences-author-date" rel="self"/>
+    <link href="http://www.zotero.org/styles/biostatistics" rel="template"/>
+    <link href="https://kirj.ee/earth-guidelines-for-authors/?v=04c19fa1e772" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="geology"/>
+    <issn>1736-6046</issn>
+    <eissn>1736-7530</eissn>
+    <updated>2022-09-05T13:49:46+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">
+    <names variable="editor">
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" strip-periods="true" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author" font-variant="normal">
+      <name font-variant="normal" and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" strip-periods="true" prefix=" (" suffix=")"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text" initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text variable="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="book thesis report patent" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="year-date">
+    <date date-parts="year" form="text" variable="issued"/>
+  </macro>
+  <macro name="year-date-bib">
+    <choose>
+      <if type="patent">
+        <date variable="issued">
+          <date-part name="year" suffix="-"/>
+          <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+          <date-part name="day" form="numeric-leading-zeros"/>
+        </date>
+      </if>
+      <else>
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short" strip-periods="true"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if variable="DOI">
+        <choose>
+          <if type="book" match="any">
+            <choose>
+              <if match="none" variable="page">
+                <text variable="DOI" prefix="https://doi.org/"/>
+              </if>
+            </choose>
+          </if>
+          <else-if type="report" match="any">
+            <group delimiter=" ">
+              <text variable="DOI" prefix="https://doi.org/"/>
+              <group delimiter=" " prefix="(" suffix=")">
+                <text term="accessed"/>
+                <date variable="issued">
+                  <date-part name="year" suffix="-"/>
+                  <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+                  <date-part name="day" form="numeric-leading-zeros"/>
+                </date>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <text variable="DOI" prefix="https://doi.org/"/>
+          </else>
+        </choose>
+      </if>
+      <else-if variable="URL">
+        <group delimiter=" " suffix=".">
+          <text variable="URL"/>
+          <group prefix="(" suffix=")">
+            <text term="accessed" suffix=" "/>
+            <date variable="accessed">
+              <date-part name="year" suffix="-"/>
+              <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+              <date-part name="day" form="numeric-leading-zeros"/>
+            </date>
+          </group>
+        </group>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year" year-suffix-delimiter=",">
+    <sort>
+      <key variable="issued" sort="ascending"/>
+      <key macro="author-short"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=" ">
+        <text macro="author-short"/>
+        <text macro="year-date"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="author"/>
+      <key variable="title"/>
+    </sort>
+    <layout>
+      <group delimiter=". " suffix=".">
+        <text macro="author"/>
+        <text macro="year-date-bib"/>
+        <choose>
+          <if type="bill book graphic legal_case legislation motion_picture song thesis" match="any">
+            <group delimiter=". " prefix=" ">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <choose>
+                <if type="thesis" match="any">
+                  <text variable="genre"/>
+                </if>
+              </choose>
+              <text macro="publisher"/>
+            </group>
+          </if>
+          <else-if type="chapter paper-conference" match="any">
+            <group delimiter=". " prefix=" ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <text term="in" suffix=" " text-case="capitalize-first"/>
+                <text variable="container-title" font-style="italic"/>
+                <text macro="editor" prefix="(" suffix=")"/>
+              </group>
+              <text macro="edition"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <text macro="title" prefix=" " suffix="."/>
+          </else-if>
+          <else-if type="report" match="any">
+            <text macro="title"/>
+          </else-if>
+          <else-if type="patent" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <text term="patent" text-case="capitalize-first"/>
+                <text variable="number"/>
+              </group>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=". ">
+              <text macro="title" prefix=" " suffix="."/>
+              <group delimiter=", ">
+                <text variable="container-title" form="long" font-style="italic"/>
+                <group>
+                  <text variable="volume" font-weight="bold"/>
+                  <text variable="issue" prefix="(" suffix=")"/>
+                </group>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/proceedings-of-the-estonian-academy-of-sciences-numeric.csl b/buildres/csl/csl-styles/proceedings-of-the-estonian-academy-of-sciences-numeric.csl
new file mode 100644
index 00000000000..6ffc0cdcc70
--- /dev/null
+++ b/buildres/csl/csl-styles/proceedings-of-the-estonian-academy-of-sciences-numeric.csl
@@ -0,0 +1,278 @@
+<?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="sort-only" page-range-format="expanded" default-locale="en-US">
+  <info>
+    <title>Proceedings of the Estonian Academy of Sciences (numeric)</title>
+    <id>http://www.zotero.org/styles/proceedings-of-the-estonian-academy-of-sciences-numeric</id>
+    <link href="http://www.zotero.org/styles/proceedings-of-the-estonian-academy-of-sciences-numeric" rel="self"/>
+    <link href="http://www.zotero.org/styles/taylor-and-francis-acs" rel="template"/>
+    <link href="https://kirj.ee/for-authors/?v=04c19fa1e772" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+      <email>citationstyler@gmail.com</email>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="generic-base"/>
+    <issn>1736-6046</issn>
+    <eissn>1736-7530</eissn>
+    <updated>2022-09-05T13:35:20+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editortranslator" form="short">
+        <single>ed. and translator</single>
+        <multiple>eds. and translators</multiple>
+      </term>
+      <term name="translator" form="short">
+        <single>translator</single>
+        <multiple>translators</multiple>
+      </term>
+      <term name="collection-editor" form="short">
+        <single>series ed.</single>
+        <multiple>series eds.</multiple>
+      </term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor translator" delimiter="; ">
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" strip-periods="true" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <names variable="author">
+      <name and="text" delimiter-precedes-last="never" initialize-with=". " name-as-sort-order="all"/>
+      <label form="short" prefix=", " text-case="capitalize-first"/>
+    </names>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=", ">
+      <text variable="publisher"/>
+      <text variable="publisher-place"/>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis patent" match="any">
+        <text variable="title" font-style="italic"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="volume">
+    <group delimiter=" ">
+      <text term="volume" form="short" text-case="capitalize-first"/>
+      <text variable="volume"/>
+    </group>
+  </macro>
+  <macro name="series">
+    <text variable="collection-title"/>
+  </macro>
+  <macro name="pages">
+    <text variable="page"/>
+  </macro>
+  <macro name="issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="full-issued">
+    <date variable="issued" delimiter=" ">
+      <date-part name="month" form="long" suffix=" "/>
+      <date-part name="day" suffix=", "/>
+      <date-part name="year"/>
+    </date>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="report" match="any">
+        <group delimiter=" ">
+          <text variable="DOI" prefix="https://doi.org/"/>
+          <group delimiter=" " prefix="(" suffix=")">
+            <text term="accessed"/>
+            <date variable="accessed">
+              <date-part name="year" suffix="-"/>
+              <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+              <date-part name="day" form="numeric-leading-zeros"/>
+            </date>
+          </group>
+        </group>
+      </if>
+      <else-if match="any" variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout vertical-align="baseline" delimiter="," prefix="[" suffix="]">
+      <text variable="citation-number"/>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush" entry-spacing="0">
+    <layout>
+      <text variable="citation-number" suffix="."/>
+      <group delimiter=". " suffix=".">
+        <text macro="author"/>
+        <choose>
+          <if type="article-journal review" match="any">
+            <group delimiter=" ">
+              <text macro="title" suffix="."/>
+              <group delimiter=", ">
+                <text variable="container-title" font-style="italic" form="short"/>
+                <text macro="issued" font-weight="normal"/>
+                <choose>
+                  <if variable="volume">
+                    <group>
+                      <text variable="volume" font-weight="bold"/>
+                      <text variable="issue" prefix="(" suffix=")"/>
+                    </group>
+                  </if>
+                  <else>
+                    <group delimiter=" ">
+                      <text term="issue" form="short" text-case="capitalize-first"/>
+                      <text variable="issue"/>
+                    </group>
+                  </else>
+                </choose>
+                <text variable="page"/>
+              </group>
+            </group>
+          </if>
+          <else-if type="article-magazine article-newspaper article" match="any">
+            <group delimiter=" ">
+              <text macro="title" suffix="."/>
+              <text variable="container-title" font-style="italic" suffix="."/>
+              <text macro="edition"/>
+              <text macro="publisher"/>
+              <group delimiter=", ">
+                <text macro="full-issued"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="thesis">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text variable="genre"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="issued"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="patent">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=", ">
+                <group delimiter=" ">
+                  <text term="patent" text-case="capitalize-first"/>
+                  <text variable="number"/>
+                </group>
+                <date variable="issued">
+                  <date-part name="year" suffix="-"/>
+                  <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+                  <date-part name="day" form="numeric-leading-zeros"/>
+                </date>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="bill book graphic legal_case legislation motion_picture song" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <text macro="edition"/>
+              <text macro="editor" prefix=" "/>
+              <text macro="series"/>
+              <choose>
+                <if type="report">
+                  <group delimiter=" ">
+                    <text variable="genre"/>
+                    <text variable="number"/>
+                  </group>
+                </if>
+              </choose>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="issued"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="volume"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+              <group delimiter=" ">
+                <text term="in" text-case="capitalize-first"/>
+                <text variable="container-title" font-style="italic"/>
+                <text macro="editor" prefix="(" suffix=")"/>
+              </group>
+              <choose>
+                <if type="entry-dictionary entry-encyclopedia" match="none"/>
+                <else>
+                  <text variable="container-title" font-style="italic"/>
+                </else>
+              </choose>
+              <text macro="series"/>
+              <text macro="volume"/>
+              <group delimiter=", ">
+                <text macro="publisher"/>
+                <text macro="issued"/>
+                <text macro="pages"/>
+              </group>
+            </group>
+          </else-if>
+          <else-if type="webpage post post-weblog" match="any">
+            <group delimiter=" ">
+              <text variable="title"/>
+              <text variable="URL"/>
+              <date delimiter="" variable="accessed" prefix="(accessed " suffix=")">
+                <date-part name="year" suffix="-"/>
+                <date-part name="month" form="numeric-leading-zeros" suffix="-"/>
+                <date-part name="day" form="numeric-leading-zeros"/>
+              </date>
+            </group>
+          </else-if>
+          <else-if type="report" match="any">
+            <group delimiter=". ">
+              <text macro="title"/>
+            </group>
+          </else-if>
+          <else>
+            <group delimiter=", ">
+              <group delimiter=". ">
+                <text macro="title"/>
+                <text variable="container-title" font-style="italic"/>
+              </group>
+              <group delimiter=", ">
+                <text macro="issued"/>
+                <text variable="volume" font-style="italic"/>
+                <text variable="page"/>
+              </group>
+            </group>
+          </else>
+        </choose>
+      </group>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/renamed-styles.json b/buildres/csl/csl-styles/renamed-styles.json
index 562bf51a94f..c191da03ae2 100644
--- a/buildres/csl/csl-styles/renamed-styles.json
+++ b/buildres/csl/csl-styles/renamed-styles.json
@@ -535,5 +535,6 @@
     "harvard-cardiff-university-old":"cardiff-university-harvard",
     "harvard-oxford-brookes-university-faculty-of-health-and-life-sciences": "harvard-cite-them-right",
     "bluebook2": "bluebook-law-review",
-    "moore-theological-college": "society-of-biblical-literature-fullnote-bibliography"
+    "moore-theological-college": "society-of-biblical-literature-fullnote-bibliography",
+    "cell-numeric-superscript": "cell"
 }
diff --git a/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl b/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl
index 5198c11eae8..2dd9a3b5d27 100644
--- a/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl
+++ b/buildres/csl/csl-styles/society-of-biblical-literature-fullnote-bibliography.csl
@@ -33,12 +33,21 @@
     <category citation-format="note"/>
     <category field="theology"/>
     <summary>Society of Biblical Literature format with full notes and bibliography</summary>
-    <updated>2022-06-29T13:58:51+00:00</updated>
+    <updated>2022-07-02T02:53:27+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-US">
     <terms>
+      <term name="article-journal" form="short">art.</term>
       <term name="editor" form="verb-short">ed.</term>
+      <term name="page" form="short">
+        <single>p. </single>
+        <multiple>pp. </multiple>
+      </term>
+      <term name="paragraph" form="short">
+        <single>¶</single>
+        <multiple>¶¶</multiple>
+      </term>
       <term name="section" form="short">
         <single>§</single>
         <multiple>§§</multiple>
@@ -675,12 +684,13 @@
     </choose>
   </macro>
   <macro name="event-note">
-    <!-- Support citation of unpublished conference presentations per SBLHS2 §6.3.8. -->
+    <!-- Support citation of unpublished conference presentations per SBLHS2 §6.3.8. Corrects for dropping of event-title information. -->
     <choose>
       <if type="speech" match="any">
         <group delimiter=" ">
           <text variable="genre"/>
           <text term="presented at" suffix=" "/>
+          <text macro="event-title" suffix=", "/>
         </group>
       </if>
     </choose>
@@ -689,9 +699,23 @@
   <macro name="event">
     <group>
       <text term="presented at" suffix=" "/>
-      <text variable="event"/>
+      <text macro="event-title"/>
     </group>
   </macro>
+  <macro name="event-title">
+    <choose>
+      <!-- TODO: We expect "event-title" to be used,
+           but processors and applications may not be updated yet.
+           This macro ensures that either "event" or "event-title" can be accpeted.
+           Remove if procesor logic and application adoption can handle this. -->
+      <if variable="event-title">
+        <text variable="event-title"/>
+      </if>
+      <else>
+        <text variable="event"/>
+      </else>
+    </choose>
+  </macro>
   <macro name="originally-published">
     <group delimiter=", ">
       <group delimiter=": ">
@@ -814,6 +838,10 @@
                 </choose>
               </group>
             </if>
+            <else>
+              <label variable="locator" form="short"/>
+              <text variable="locator"/>
+            </else>
           </choose>
         </if>
         <else-if variable="volume">
@@ -854,7 +882,22 @@
         <text macro="pages"/>
       </if>
       <else-if type="article-journal">
-        <text variable="locator" prefix=": "/>
+        <!-- Add support for individually paginated, electronic journal articles per https://sblhs2.com/2018/05/03/electronic-journals-with-individually-paginated-articles/ -->
+        <choose>
+          <if variable="number">
+            <group delimiter=" " prefix=": ">
+              <text term="article-journal" form="short"/>
+              <text variable="number"/>
+            </group>
+            <group prefix=", ">
+              <label variable="locator" form="short"/>
+              <text variable="locator"/>
+            </group>
+          </if>
+          <else>
+            <text variable="locator" prefix=": "/>
+          </else>
+        </choose>
       </else-if>
       <else-if type="entry-dictionary entry-encyclopedia" match="any">
         <choose>
@@ -876,7 +919,37 @@
   <macro name="pages">
     <choose>
       <if type="article-journal">
-        <text variable="page" prefix=": "/>
+        <!-- Add support for individually paginated, electronic journal articles per https://sblhs2.com/2018/05/03/electronic-journals-with-individually-paginated-articles/ -->
+        <choose>
+          <if variable="number">
+            <text term="article-journal" form="short" prefix=": "/>
+            <text variable="number" prefix=" " suffix=", "/>
+            <choose>
+              <if variable="locator">
+                <label variable="locator" form="short"/>
+                <text variable="locator"/>
+              </if>
+              <else-if variable="page">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </else-if>
+              <else>
+                <!-- Is there not a term for "no page"? See SBLHS2 §8.1.3 and CMS17 §10.42 where the same abbreviation applies to "no place," "no publisher," and "no page." -->
+                <text value="n.p."/>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <choose>
+              <if variable="locator">
+                <text variable="locator" prefix=": "/>
+              </if>
+              <else>
+                <text variable="page" prefix=": "/>
+              </else>
+            </choose>
+          </else>
+        </choose>
       </if>
       <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
         <choose>
@@ -906,7 +979,26 @@
   <macro name="locators-journal">
     <choose>
       <if type="article-journal">
-        <text variable="page" prefix=": "/>
+        <!-- Add support for individually paginated, electronic journal articles per https://sblhs2.com/2018/05/03/electronic-journals-with-individually-paginated-articles/ -->
+        <choose>
+          <if variable="number">
+            <text term="article-journal" form="short" prefix=": "/>
+            <text variable="number" prefix=" " suffix=", "/>
+            <choose>
+              <if variable="page">
+                <label variable="page" form="short"/>
+                <text variable="page"/>
+              </if>
+              <else>
+                <!-- Is there not a term for "no page"? See SBLHS2 §8.1.3 and CMS17 §10.42 where the same abbreviation applies to "no place," "no publisher," and "no page." -->
+                <text value="n.p."/>
+              </else>
+            </choose>
+          </if>
+          <else>
+            <text variable="page" prefix=": "/>
+          </else>
+        </choose>
       </if>
     </choose>
   </macro>
diff --git a/buildres/csl/csl-styles/spec/filters.yaml b/buildres/csl/csl-styles/spec/filters.yaml
index 1c4ddb7bab4..48cb27087d4 100644
--- a/buildres/csl/csl-styles/spec/filters.yaml
+++ b/buildres/csl/csl-styles/spec/filters.yaml
@@ -39,6 +39,8 @@ ISSN:
 - 1520-8524
 - 1161-9473
 - 2496-7114
+- 1736-6046
+- 1736-7530
 
 # These titles are ignored when checking for duplicate titles
 TITLES: []
diff --git a/buildres/csl/csl-styles/the-american-journal-of-human-genetics.csl b/buildres/csl/csl-styles/stem-cell-reports.csl
similarity index 53%
rename from buildres/csl/csl-styles/the-american-journal-of-human-genetics.csl
rename to buildres/csl/csl-styles/stem-cell-reports.csl
index fbfef29d148..60c605a3e3e 100644
--- a/buildres/csl/csl-styles/the-american-journal-of-human-genetics.csl
+++ b/buildres/csl/csl-styles/stem-cell-reports.csl
@@ -1,23 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" default-locale="en-US" demote-non-dropping-particle="sort-only" page-range-format="expanded">
+<style xmlns="http://purl.org/net/xbiblio/csl" version="1.0" class="in-text" demote-non-dropping-particle="sort-only" page-range-format="expanded" default-locale="en-US">
   <info>
-    <title>The American Journal of Human Genetics</title>
-    <id>http://www.zotero.org/styles/the-american-journal-of-human-genetics</id>
-    <link href="http://www.zotero.org/styles/the-american-journal-of-human-genetics" rel="self"/>
+    <title>Stem Cell Reports</title>
+    <id>http://www.zotero.org/styles/stem-cell-reports</id>
+    <link href="http://www.zotero.org/styles/stem-cell-reports" rel="self"/>
     <link href="http://www.zotero.org/styles/cell" rel="template"/>
-    <link href="http://www.cell.com/AJHG/home" rel="documentation"/>
-    <contributor>
-      <name>Jessica Chong</name>
-      <email>jxchong@gmail.com</email>
-    </contributor>
-    <category citation-format="numeric"/>
+    <link href="http://www.cell.com/stem-cell-reports/authors" rel="documentation"/>
+    <category citation-format="author-date"/>
     <category field="biology"/>
-    <issn>0002-9297</issn>
-    <eissn>1537-6605</eissn>
-    <summary>The AJHG journal style. Adapted from the Cell and Vancouver superscript styles by Jessica Chong.</summary>
-    <updated>2012-09-27T22:06:38+00:00</updated>
+    <category field="medicine"/>
+    <eissn>2213-6711</eissn>
+    <updated>2016-12-13T12:00:00+00:00</updated>
     <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
   </info>
+  <macro name="author-short">
+    <names variable="author">
+      <name form="short" and="text"/>
+    </names>
+  </macro>
+  <macro name="author-count">
+    <names variable="author">
+      <name form="count"/>
+    </names>
+  </macro>
   <macro name="author">
     <names variable="author">
       <name name-as-sort-order="all" initialize-with="." and="text" delimiter-precedes-last="always"/>
@@ -40,20 +45,39 @@
       <label form="short" prefix=", "/>
     </names>
   </macro>
-  <citation collapse="citation-number">
+  <macro name="doi">
+    <choose>
+      <if variable="DOI">
+        <text variable="DOI" prefix="https://doi.org/"/>
+      </if>
+      <else-if type="webpage post post-weblog" match="any">
+        <text variable="URL"/>
+      </else-if>
+    </choose>
+  </macro>
+  <citation et-al-min="3" et-al-use-first="1" disambiguate-add-year-suffix="true" collapse="year">
     <sort>
-      <key variable="citation-number"/>
+      <key macro="author-short" names-min="1" names-use-first="1"/>
+      <key macro="author-count" names-min="3" names-use-first="3"/>
+      <key macro="author" names-min="3" names-use-first="1"/>
+      <key macro="issued"/>
+      <key variable="title"/>
     </sort>
-    <layout delimiter="," vertical-align="sup">
-      <text variable="citation-number"/>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <text macro="author-short"/>
+        <text macro="issued"/>
+      </group>
     </layout>
   </citation>
   <bibliography et-al-min="11" et-al-use-first="10">
     <sort>
-      <key variable="citation-number"/>
+      <key macro="author-short" names-min="1" names-use-first="1"/>
+      <key macro="author-count" names-min="3" names-use-first="3"/>
+      <key macro="author" names-min="3" names-use-first="1"/>
+      <key macro="issued"/>
     </sort>
     <layout suffix=".">
-      <text variable="citation-number" suffix=". "/>
       <group delimiter=" ">
         <text macro="author"/>
         <text macro="issued" prefix="(" suffix=")."/>
@@ -61,8 +85,13 @@
           <if type="article article-magazine article-newspaper article-journal review" match="any">
             <text variable="title" suffix="."/>
             <text variable="container-title" form="short" text-case="title"/>
-            <text variable="volume" font-style="italic" suffix=","/>
-            <text variable="page"/>
+            <group delimiter=", " suffix=". ">
+              <text variable="volume" font-style="italic"/>
+              <text variable="page"/>
+            </group>
+            <group>
+              <text macro="doi"/>
+            </group>
           </if>
           <else-if type="chapter paper-conference" match="any">
             <text variable="title" suffix="."/>
diff --git a/buildres/csl/csl-styles/taylor-and-francis-ama.csl b/buildres/csl/csl-styles/taylor-and-francis-ama.csl
new file mode 100644
index 00000000000..9bcff132f7f
--- /dev/null
+++ b/buildres/csl/csl-styles/taylor-and-francis-ama.csl
@@ -0,0 +1,274 @@
+<?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="sort-only" page-range-format="expanded" initialize-with-hyphen="false" default-locale="en-US">
+  <info>
+    <title>Taylor &amp; Francis - AMA</title>
+    <id>http://www.zotero.org/styles/taylor-and-francis-ama</id>
+    <link href="http://www.zotero.org/styles/taylor-and-francis-ama" rel="self"/>
+    <link href="http://www.zotero.org/styles/american-medical-association" rel="template"/>
+    <link href="https://www.tandfonline.com/action/authorSubmission?show=instructions&amp;journalCode=ytsr20#submitting-your-paper" rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="numeric"/>
+    <category field="medicine"/>
+    <summary>The American Medical Association style as used in JAMA. Version 11 as per November-2019.</summary>
+    <updated>2022-09-11T09:34:43+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="page-range-delimiter">-</term>
+      <term name="presented at">presented at</term>
+    </terms>
+  </locale>
+  <macro name="editor">
+    <names variable="editor">
+      <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+      <label form="short" prefix=", "/>
+    </names>
+  </macro>
+  <macro name="author">
+    <group suffix=".">
+      <names variable="author">
+        <name name-as-sort-order="all" sort-separator=" " initialize-with="" delimiter=", " delimiter-precedes-last="always"/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+    </group>
+  </macro>
+  <macro name="access">
+    <choose>
+      <if type="article-newspaper" match="none">
+        <choose>
+          <if variable="DOI">
+            <text value="doi:"/>
+            <text variable="DOI"/>
+          </if>
+          <else-if variable="URL">
+            <group delimiter=". ">
+              <choose>
+                <if type="webpage post post-weblog" match="any">
+                  <date variable="issued" prefix="Published " form="text"/>
+                </if>
+              </choose>
+              <text variable="URL"/>
+              <group>
+                <text term="accessed" text-case="capitalize-first" suffix=" "/>
+                <date variable="accessed">
+                  <date-part name="month" suffix=" "/>
+                  <date-part name="day" suffix=", "/>
+                  <date-part name="year"/>
+                </date>
+              </group>
+            </group>
+          </else-if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song thesis" match="any">
+        <text variable="title" font-style="italic" text-case="title"/>
+      </if>
+      <else>
+        <text variable="title"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <text variable="publisher"/>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if is-numeric="edition">
+        <group delimiter=" ">
+          <number variable="edition" form="ordinal"/>
+          <text term="edition" form="short"/>
+        </group>
+      </if>
+      <else>
+        <text variable="edition" suffix="."/>
+      </else>
+    </choose>
+  </macro>
+  <citation collapse="citation-number">
+    <sort>
+      <key variable="citation-number"/>
+    </sort>
+    <layout delimiter="," vertical-align="sup">
+      <text variable="citation-number"/>
+      <group prefix="(" suffix=")">
+        <label variable="locator" form="short" strip-periods="true"/>
+        <text variable="locator"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
+    <layout>
+      <text variable="citation-number" prefix="[" suffix="]"/>
+      <text macro="author"/>
+      <text macro="title" prefix=" " suffix="."/>
+      <choose>
+        <if type="bill book graphic legislation motion_picture report song" match="any">
+          <group suffix="." prefix=" " delimiter=" ">
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
+              <text variable="volume" suffix="."/>
+            </group>
+            <text macro="edition"/>
+            <text macro="editor" prefix="(" suffix=")"/>
+          </group>
+          <text macro="publisher" prefix=" "/>
+          <group suffix="." prefix="; ">
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+            <text variable="page" prefix=":"/>
+          </group>
+        </if>
+        <else-if type="chapter paper-conference entry-dictionary entry-encyclopedia" match="any">
+          <group prefix=" " delimiter=" ">
+            <text term="in" text-case="capitalize-first" suffix=":"/>
+            <text macro="editor"/>
+            <text variable="container-title" font-style="italic" suffix="." text-case="title"/>
+            <group delimiter=" ">
+              <text term="volume" form="short" text-case="capitalize-first" strip-periods="true"/>
+              <text variable="volume" suffix="."/>
+            </group>
+            <text macro="edition"/>
+            <text variable="collection-title" suffix="."/>
+            <group suffix=".">
+              <text macro="publisher"/>
+              <group suffix="." prefix="; ">
+                <date variable="issued">
+                  <date-part name="year"/>
+                </date>
+                <text variable="page" prefix=":"/>
+              </group>
+            </group>
+          </group>
+        </else-if>
+        <else-if type="article-newspaper">
+          <text variable="container-title" font-style="italic" prefix=" " suffix=". "/>
+          <choose>
+            <if variable="URL">
+              <group delimiter=". " suffix=".">
+                <text variable="URL"/>
+                <group prefix="Published ">
+                  <date variable="issued">
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="day" suffix=", "/>
+                    <date-part name="year"/>
+                  </date>
+                </group>
+                <group>
+                  <text term="accessed" text-case="capitalize-first" suffix=" "/>
+                  <date variable="accessed">
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="day" suffix=", "/>
+                    <date-part name="year"/>
+                  </date>
+                </group>
+              </group>
+            </if>
+            <else>
+              <group delimiter=":" suffix=".">
+                <group>
+                  <date variable="issued">
+                    <date-part name="month" suffix=" "/>
+                    <date-part name="day" suffix=", "/>
+                    <date-part name="year"/>
+                  </date>
+                </group>
+                <text variable="page"/>
+              </group>
+            </else>
+          </choose>
+        </else-if>
+        <else-if type="legal_case">
+          <group suffix="," prefix=" " delimiter=" ">
+            <text macro="editor" prefix="(" suffix=")"/>
+          </group>
+          <group prefix=" " delimiter=" ">
+            <text variable="container-title"/>
+            <text variable="volume"/>
+          </group>
+          <text variable="page" prefix=", " suffix=" "/>
+          <group prefix="(" suffix=")." delimiter=" ">
+            <text variable="authority"/>
+            <date variable="issued">
+              <date-part name="year"/>
+            </date>
+          </group>
+        </else-if>
+        <else-if type="webpage post post-weblog" match="any">
+          <text variable="container-title" prefix=" " suffix="."/>
+        </else-if>
+        <else-if type="speech">
+          <group prefix=" " suffix=":">
+            <choose>
+              <if variable="genre">
+                <text variable="genre" suffix=" "/>
+                <text term="presented at"/>
+              </if>
+              <else>
+                <text term="presented at" text-case="capitalize-first"/>
+              </else>
+            </choose>
+          </group>
+          <group delimiter="; " prefix=" " suffix=".">
+            <text variable="event"/>
+            <group>
+              <date delimiter=" " variable="issued">
+                <date-part name="month"/>
+                <date-part name="day" suffix=","/>
+                <date-part name="year"/>
+              </date>
+            </group>
+            <text variable="event-place"/>
+          </group>
+        </else-if>
+        <else-if type="thesis" match="any">
+          <group delimiter=". " prefix=" " suffix=".">
+            <text variable="genre"/>
+            <group delimiter="; ">
+              <text variable="publisher"/>
+              <date date-parts="year" form="text" variable="issued"/>
+            </group>
+          </group>
+        </else-if>
+        <else>
+          <text macro="editor" prefix=" " suffix="."/>
+          <group prefix=" " suffix=".">
+            <text variable="container-title" font-style="italic" form="short" strip-periods="true" suffix="."/>
+            <group delimiter=";" prefix=" ">
+              <choose>
+                <if variable="issue volume" match="any">
+                  <date variable="issued">
+                    <date-part name="year"/>
+                  </date>
+                </if>
+                <else>
+                  <group delimiter=" ">
+                    <text value="Published online"/>
+                    <date form="text" date-parts="year-month-day" variable="issued"/>
+                  </group>
+                </else>
+              </choose>
+              <group>
+                <text variable="volume"/>
+                <text variable="issue" prefix="(" suffix=")"/>
+              </group>
+            </group>
+            <text variable="page" prefix=":"/>
+          </group>
+        </else>
+      </choose>
+      <text prefix=" " macro="access"/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/taylor-and-francis-chicago-b-author-date.csl b/buildres/csl/csl-styles/taylor-and-francis-chicago-b-author-date.csl
new file mode 100644
index 00000000000..68a1acf4cc3
--- /dev/null
+++ b/buildres/csl/csl-styles/taylor-and-francis-chicago-b-author-date.csl
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="never" page-range-format="expanded">
+  <info>
+    <title>Taylor &amp; Francis - US Chicago Manual of Style B (author-date)</title>
+    <id>http://www.zotero.org/styles/taylor-and-francis-chicago-b-author-date</id>
+    <link href="http://www.zotero.org/styles/taylor-and-francis-chicago-b-author-date" rel="self"/>
+    <link href="http://www.zotero.org/styles/taylor-and-francis-chicago-author-date" rel="template"/>
+    <link href="https://www.tandfonline.com/action/authorSubmission?show=instructions&amp;journalCode=bfsn20#references" rel="documentation"/>
+    <link href="https://files.taylorandfrancis.com/tf_uschicagob.pdf?_ga=2.240778371.1215313033.1663204255-1541022656.1660640477&amp;_gl=1*sznl2u*_ga*MTU0MTAyMjY1Ni4xNjYwNjQwNDc3*_ga_0HYE8YG0M6*MTY2MzIwNDI1NS40LjEuMTY2MzIwNDI4Ny4wLjAuMA." rel="documentation"/>
+    <author>
+      <name>Patrick O'Brien</name>
+    </author>
+    <category citation-format="author-date"/>
+    <category field="generic-base"/>
+    <updated>2022-09-20T13:25:22+00:00</updated>
+    <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
+  </info>
+  <locale xml:lang="en">
+    <terms>
+      <term name="editor" form="verb-short">ed.</term>
+      <term name="container-author" form="verb">by</term>
+      <term name="translator" form="verb-short">trans.</term>
+      <term name="editortranslator" form="verb">edited and translated by</term>
+      <term name="translator" form="short">trans.</term>
+    </terms>
+  </locale>
+  <macro name="secondary-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="none">
+        <names variable="editor translator" delimiter=". ">
+          <label form="verb" text-case="capitalize-first" suffix=" "/>
+          <name and="text" delimiter=", "/>
+        </names>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-contributors">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <group prefix=", " delimiter=", ">
+          <names variable="container-author" delimiter=", ">
+            <label form="verb" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+          <names variable="editor translator" delimiter=", ">
+            <label form="short" plural="never" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="recipient">
+    <choose>
+      <if type="personal_communication">
+        <choose>
+          <if variable="genre">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+          <else>
+            <text term="letter" text-case="capitalize-first"/>
+          </else>
+        </choose>
+      </if>
+    </choose>
+    <names variable="recipient" delimiter=", ">
+      <label form="verb" prefix=" " text-case="lowercase" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="substitute-title">
+    <choose>
+      <if type="article-journal article-magazine article-newspaper review review-book" match="any">
+        <text macro="container-title"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="contributors">
+    <group delimiter=". ">
+      <names variable="author">
+        <name and="text" name-as-sort-order="first" sort-separator=", " delimiter=", " delimiter-precedes-last="always"/>
+        <label form="short" prefix=", "/>
+        <substitute>
+          <names variable="editor"/>
+          <names variable="translator"/>
+          <text macro="substitute-title"/>
+          <text macro="title"/>
+        </substitute>
+      </names>
+      <text macro="recipient"/>
+    </group>
+  </macro>
+  <macro name="contributors-short">
+    <names variable="author">
+      <name form="short" and="text" delimiter=", " initialize-with=". "/>
+      <substitute>
+        <names variable="editor"/>
+        <names variable="translator"/>
+        <text macro="substitute-title"/>
+        <text macro="title"/>
+      </substitute>
+    </names>
+  </macro>
+  <macro name="interviewer">
+    <names variable="interviewer" delimiter=", ">
+      <label form="verb" prefix=" " text-case="capitalize-first" suffix=" "/>
+      <name and="text" delimiter=", "/>
+    </names>
+  </macro>
+  <macro name="archive">
+    <group delimiter=". ">
+      <text variable="archive_location" text-case="capitalize-first"/>
+      <text variable="archive"/>
+      <text variable="archive-place"/>
+    </group>
+  </macro>
+  <macro name="access">
+    <group delimiter=". ">
+      <choose>
+        <if type="graphic report" match="any">
+          <text macro="archive"/>
+        </if>
+        <else-if type="article-journal bill book chapter legal_case legislation motion_picture paper-conference" match="none">
+          <text macro="archive"/>
+        </else-if>
+      </choose>
+      <choose>
+        <if variable="issued" match="none">
+          <group delimiter=" ">
+            <text term="accessed" text-case="capitalize-first"/>
+            <date variable="accessed" delimiter=" ">
+              <date-part name="month"/>
+              <date-part name="day"/>
+            </date>
+          </group>
+        </if>
+      </choose>
+      <choose>
+        <if type="legal_case" match="none">
+          <choose>
+            <if variable="DOI">
+              <text variable="DOI" prefix="doi:"/>
+            </if>
+            <else>
+              <text variable="URL"/>
+            </else>
+          </choose>
+        </if>
+      </choose>
+    </group>
+  </macro>
+  <macro name="title">
+    <choose>
+      <if variable="title" match="none">
+        <choose>
+          <if type="personal_communication" match="none">
+            <text variable="genre" text-case="capitalize-first"/>
+          </if>
+        </choose>
+      </if>
+      <else-if type="bill book graphic legislation motion_picture report song" match="any">
+        <text variable="title" text-case="title" font-style="italic"/>
+        <group prefix=" (" suffix=")" delimiter=" ">
+          <text term="version"/>
+          <text variable="version"/>
+        </group>
+      </else-if>
+      <else-if variable="reviewed-author">
+        <group delimiter=", ">
+          <text variable="title" font-style="italic" prefix="Review of "/>
+          <names variable="reviewed-author">
+            <label form="verb-short" text-case="lowercase" suffix=" "/>
+            <name and="text" delimiter=", "/>
+          </names>
+        </group>
+      </else-if>
+      <else-if type="legal_case interview" match="any">
+        <text variable="title"/>
+      </else-if>
+      <else>
+        <text variable="title" text-case="title" quotes="false"/>
+      </else>
+    </choose>
+  </macro>
+  <macro name="edition">
+    <choose>
+      <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=". ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short" strip-periods="true"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" prefix=". "/>
+          </else>
+        </choose>
+      </if>
+      <else-if type="chapter  paper-conference" match="any">
+        <choose>
+          <if is-numeric="edition">
+            <group delimiter=" " prefix=", ">
+              <number variable="edition" form="ordinal"/>
+              <text term="edition" form="short"/>
+            </group>
+          </if>
+          <else>
+            <text variable="edition" prefix=", "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators">
+    <choose>
+      <if type="article-journal">
+        <choose>
+          <if variable="volume">
+            <text variable="volume" prefix=" "/>
+            <group prefix=" (" suffix=")">
+              <choose>
+                <if variable="issue">
+                  <text variable="issue"/>
+                </if>
+                <else>
+                  <date variable="issued">
+                    <date-part name="month"/>
+                  </date>
+                </else>
+              </choose>
+            </group>
+          </if>
+          <else-if variable="issue">
+            <group delimiter=" " prefix=", ">
+              <text term="issue" form="short"/>
+              <text variable="issue"/>
+              <date variable="issued" prefix="(" suffix=")">
+                <date-part name="month"/>
+              </date>
+            </group>
+          </else-if>
+          <else>
+            <date variable="issued" prefix=", ">
+              <date-part name="month"/>
+            </date>
+          </else>
+        </choose>
+      </if>
+      <else-if type="legal_case">
+        <text variable="volume" prefix=", "/>
+        <text variable="container-title" prefix=" "/>
+        <text variable="page" prefix=" "/>
+      </else-if>
+      <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+        <group prefix=". " delimiter=". ">
+          <group>
+            <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+            <number variable="volume" form="numeric"/>
+          </group>
+          <group>
+            <number variable="number-of-volumes" form="numeric"/>
+            <text term="volume" form="short" prefix=" " plural="true"/>
+          </group>
+        </group>
+      </else-if>
+      <else-if type="chapter paper-conference" match="any">
+        <choose>
+          <if variable="page" match="none">
+            <group prefix=". ">
+              <text term="volume" form="short" text-case="capitalize-first" suffix=" "/>
+              <number variable="volume" form="numeric"/>
+            </group>
+          </if>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="locators-chapter">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <choose>
+          <if variable="page">
+            <group prefix=", ">
+              <text variable="volume" suffix=":"/>
+              <text variable="page"/>
+            </group>
+          </if>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="locators-article">
+    <choose>
+      <if type="article-newspaper">
+        <group prefix=", " delimiter=", ">
+          <group delimiter=" ">
+            <text variable="edition"/>
+            <text term="edition"/>
+          </group>
+          <group>
+            <text term="section" form="short" suffix=" "/>
+            <text variable="section"/>
+          </group>
+        </group>
+      </if>
+      <else-if type="article-journal">
+        <choose>
+          <if variable="volume issue" match="any">
+            <text variable="page" prefix=":"/>
+          </if>
+          <else>
+            <text variable="page" prefix=", "/>
+          </else>
+        </choose>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="point-locators">
+    <choose>
+      <if variable="locator">
+        <choose>
+          <if locator="page" match="none">
+            <choose>
+              <if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+                <choose>
+                  <if variable="volume">
+                    <group>
+                      <text term="volume" form="short" suffix=" "/>
+                      <number variable="volume" form="numeric"/>
+                      <label variable="locator" form="short" prefix=", " suffix=" "/>
+                    </group>
+                  </if>
+                  <else>
+                    <label variable="locator" form="short" suffix=" "/>
+                  </else>
+                </choose>
+              </if>
+              <else>
+                <label variable="locator" form="short" suffix=" "/>
+              </else>
+            </choose>
+          </if>
+          <else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
+            <number variable="volume" form="numeric" suffix=":"/>
+          </else-if>
+        </choose>
+        <text variable="locator"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="container-prefix">
+    <text term="in" text-case="capitalize-first"/>
+  </macro>
+  <macro name="container-title">
+    <choose>
+      <if type="chapter paper-conference" match="any">
+        <text macro="container-prefix" suffix=" "/>
+      </if>
+    </choose>
+    <choose>
+      <if type="legal_case" match="none">
+        <text variable="container-title" text-case="title" font-style="italic"/>
+      </if>
+    </choose>
+  </macro>
+  <macro name="publisher">
+    <group delimiter=": ">
+      <text variable="publisher-place"/>
+      <text variable="publisher"/>
+    </group>
+  </macro>
+  <macro name="date">
+    <choose>
+      <if variable="issued">
+        <date variable="issued">
+          <date-part name="year"/>
+        </date>
+      </if>
+      <else-if variable="accessed">
+        <date variable="accessed">
+          <date-part name="year"/>
+        </date>
+      </else-if>
+    </choose>
+  </macro>
+  <macro name="day-month">
+    <date variable="issued">
+      <date-part name="month"/>
+      <date-part name="day" prefix=" "/>
+    </date>
+  </macro>
+  <macro name="collection-title">
+    <choose>
+      <if match="none" type="article-journal">
+        <choose>
+          <if match="none" is-numeric="collection-number">
+            <group delimiter=", ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </if>
+          <else>
+            <group delimiter=" ">
+              <text variable="collection-title" text-case="title"/>
+              <text variable="collection-number"/>
+            </group>
+          </else>
+        </choose>
+      </if>
+    </choose>
+  </macro>
+  <macro name="collection-title-journal">
+    <choose>
+      <if type="article-journal">
+        <group delimiter=" ">
+          <text variable="collection-title"/>
+          <text variable="collection-number"/>
+        </group>
+      </if>
+    </choose>
+  </macro>
+  <macro name="event">
+    <group>
+      <text term="presented at" suffix=" "/>
+      <text variable="event"/>
+    </group>
+  </macro>
+  <macro name="description">
+    <choose>
+      <if type="interview">
+        <group delimiter=". ">
+          <text macro="interviewer"/>
+          <text variable="medium" text-case="capitalize-first"/>
+        </group>
+      </if>
+      <else>
+        <text variable="medium" text-case="capitalize-first" prefix=". "/>
+      </else>
+    </choose>
+    <choose>
+      <if variable="title" match="none"/>
+      <else-if type="thesis personal_communication speech" match="any"/>
+      <else>
+        <group delimiter=" " prefix=". ">
+          <text variable="genre" text-case="capitalize-first"/>
+          <choose>
+            <if type="report">
+              <text variable="number"/>
+            </if>
+          </choose>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <macro name="issue">
+    <choose>
+      <if type="legal_case">
+        <text variable="authority" prefix=". "/>
+      </if>
+      <else-if type="speech">
+        <group prefix=". " delimiter=", ">
+          <group delimiter=" ">
+            <text variable="genre" text-case="capitalize-first"/>
+            <text macro="event"/>
+          </group>
+          <text variable="event-place"/>
+          <text macro="day-month"/>
+        </group>
+      </else-if>
+      <else-if type="article-newspaper article-magazine personal_communication" match="any">
+        <text macro="day-month" prefix=", "/>
+      </else-if>
+      <else>
+        <group prefix=". " delimiter=", ">
+          <choose>
+            <if type="thesis">
+              <text variable="genre" text-case="capitalize-first"/>
+            </if>
+          </choose>
+          <text macro="publisher"/>
+        </group>
+      </else>
+    </choose>
+  </macro>
+  <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true" givenname-disambiguation-rule="primary-name">
+    <sort>
+      <key macro="contributors"/>
+      <key macro="date"/>
+    </sort>
+    <layout prefix="(" suffix=")" delimiter="; ">
+      <group delimiter=", ">
+        <group delimiter=" ">
+          <text macro="contributors-short"/>
+          <text macro="date"/>
+        </group>
+        <text macro="point-locators"/>
+      </group>
+    </layout>
+  </citation>
+  <bibliography et-al-min="11" et-al-use-first="10" entry-spacing="0" hanging-indent="true">
+    <sort>
+      <key macro="contributors"/>
+      <key variable="issued"/>
+    </sort>
+    <layout suffix=".">
+      <group delimiter=". ">
+        <text macro="contributors"/>
+        <text macro="date"/>
+        <text macro="title"/>
+      </group>
+      <text macro="description"/>
+      <text macro="secondary-contributors" prefix=". "/>
+      <text macro="container-title" prefix=". "/>
+      <text macro="container-contributors"/>
+      <text macro="edition"/>
+      <text macro="locators-chapter"/>
+      <text macro="collection-title-journal" prefix=", " suffix=", "/>
+      <text macro="locators"/>
+      <text macro="collection-title" prefix=". "/>
+      <text macro="issue"/>
+      <text macro="locators-article"/>
+      <text macro="access" prefix=". "/>
+    </layout>
+  </bibliography>
+</style>
diff --git a/buildres/csl/csl-styles/vancouver.csl b/buildres/csl/csl-styles/vancouver.csl
index 71c92032289..e39efa8d842 100644
--- a/buildres/csl/csl-styles/vancouver.csl
+++ b/buildres/csl/csl-styles/vancouver.csl
@@ -323,7 +323,7 @@
   </citation>
   <bibliography et-al-min="7" et-al-use-first="6" second-field-align="flush">
     <layout>
-      <text variable="citation-number" suffix=". "/>
+      <text variable="citation-number" suffix="."/>
       <group delimiter=". " suffix=". ">
         <text macro="author"/>
         <text macro="title"/>
diff --git a/lib/afterburner.fx.jar b/lib/afterburner.fx.jar
deleted file mode 100644
index 816b3e27f5d..00000000000
Binary files a/lib/afterburner.fx.jar and /dev/null differ
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index c05e10bda2b..3b49cad2af9 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -54,7 +54,7 @@
     requires jdk.xml.dom;
 
     // Annotations (@PostConstruct)
-    requires java.annotation;
+    requires jakarta.annotation;
 
     // Microsoft application insights
     requires applicationinsights.core;
diff --git a/src/main/java/org/jabref/gui/EntryTypeView.java b/src/main/java/org/jabref/gui/EntryTypeView.java
index 7db73467529..c126019e22e 100644
--- a/src/main/java/org/jabref/gui/EntryTypeView.java
+++ b/src/main/java/org/jabref/gui/EntryTypeView.java
@@ -5,8 +5,6 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
 import javafx.application.Platform;
 import javafx.event.Event;
 import javafx.fxml.FXML;
@@ -42,6 +40,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 
 /**
  * Dialog that prompts the user to choose a type for an entry.
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 9a5aeac2d9a..9da1e8fd77f 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -192,7 +192,7 @@ public JabRefFrame(Stage mainStage) {
         this.undoManager = Globals.undoManager;
         this.globalSearchBar = new GlobalSearchBar(this, stateManager, prefs, undoManager, dialogService);
         this.pushToApplicationCommand = new PushToApplicationCommand(stateManager, dialogService, prefs);
-        this.fileHistory = new FileHistoryMenu(prefs, dialogService, getOpenDatabaseAction());
+        this.fileHistory = new FileHistoryMenu(prefs.getGuiPreferences().getFileHistory(), dialogService, getOpenDatabaseAction());
         this.taskExecutor = Globals.TASK_EXECUTOR;
         this.importFormatReader = Globals.IMPORT_FORMAT_READER;
         this.setOnKeyTyped(key -> {
@@ -402,7 +402,7 @@ private void tearDownJabRef(List<String> filenames) {
             // Here we store the names of all current files. If there is no current file, we remove any
             // previously stored filename.
             if (filenames.isEmpty()) {
-                prefs.clearEditedFiles();
+                prefs.getGuiPreferences().getLastFilesOpened().clear();
             } else {
                 Path focusedDatabase = getCurrentLibraryTab().getBibDatabaseContext()
                                                              .getDatabasePath()
diff --git a/src/main/java/org/jabref/gui/JabRefGUI.java b/src/main/java/org/jabref/gui/JabRefGUI.java
index 2acb97939c1..29883a51ebb 100644
--- a/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -135,7 +135,7 @@ private void openDatabases() {
         // Remove invalid databases
         List<ParserResult> invalidDatabases = bibDatabases.stream()
                                                           .filter(ParserResult::isInvalid)
-                                                          .collect(Collectors.toList());
+                                                          .toList();
         failed.addAll(invalidDatabases);
         bibDatabases.removeAll(invalidDatabases);
 
diff --git a/src/main/java/org/jabref/gui/LibraryTab.java b/src/main/java/org/jabref/gui/LibraryTab.java
index da1c3179e64..607bcb474f7 100644
--- a/src/main/java/org/jabref/gui/LibraryTab.java
+++ b/src/main/java/org/jabref/gui/LibraryTab.java
@@ -888,16 +888,6 @@ public void listen(EntriesRemovedEvent removedEntriesEvent) {
 
     private class IndexUpdateListener {
 
-        public IndexUpdateListener() {
-            if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
-                try {
-                    indexingTaskManager.updateIndex(PdfIndexer.of(bibDatabaseContext, preferencesService.getFilePreferences()), bibDatabaseContext);
-                } catch (IOException e) {
-                    LOGGER.error("Cannot access lucene index", e);
-                }
-            }
-        }
-
         @Subscribe
         public void listen(EntriesAddedEvent addedEntryEvent) {
             if (preferencesService.getFilePreferences().shouldFulltextIndexLinkedFiles()) {
diff --git a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
index bb5dd512a2d..399a2d1f053 100644
--- a/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
+++ b/src/main/java/org/jabref/gui/auximport/FromAuxDialog.java
@@ -2,8 +2,6 @@
 
 import java.nio.file.Path;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -27,6 +25,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 /**
  * A wizard dialog for generating a new sub database from existing TeX AUX file
diff --git a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
index 3a5d0ec7a3f..95d6ba5a692 100644
--- a/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
+++ b/src/main/java/org/jabref/gui/bibtexextractor/ExtractBibtexDialog.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.bibtexextractor;
 
-import javax.inject.Inject;
 import javax.swing.undo.UndoManager;
 
 import javafx.fxml.FXML;
@@ -20,6 +19,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 /**
  * GUI Dialog for the feature "Extract BibTeX from plain text".
diff --git a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java
index 744bf914f1f..f99dfab3c70 100644
--- a/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java
+++ b/src/main/java/org/jabref/gui/collab/ExternalChangesResolverDialog.java
@@ -4,7 +4,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.inject.Inject;
 import javax.swing.undo.UndoManager;
 
 import javafx.application.Platform;
@@ -26,6 +25,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
index 43023cab438..078ef89fabd 100644
--- a/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
+++ b/src/main/java/org/jabref/gui/collab/metedatachange/MetadataChangeDetailsView.java
@@ -4,6 +4,7 @@
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.collab.ExternalChangeDetailsView;
+import org.jabref.logic.bibtex.comparator.MetaDataDiff;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
@@ -16,8 +17,8 @@ public MetadataChangeDetailsView(MetadataChange metadataChange, PreferencesServi
         header.getStyleClass().add("sectionHeader");
         container.getChildren().add(header);
 
-        for (String change : metadataChange.getMetaDataDiff().getDifferences(preferencesService)) {
-            container.getChildren().add(new Label(change));
+        for (MetaDataDiff.Difference change : metadataChange.getMetaDataDiff().getDifferences(preferencesService)) {
+            container.getChildren().add(new Label(getDifferenceString(change)));
         }
 
         setLeftAnchor(container, 8d);
@@ -27,4 +28,33 @@ public MetadataChangeDetailsView(MetadataChange metadataChange, PreferencesServi
 
         getChildren().setAll(container);
     }
+
+    private String getDifferenceString(MetaDataDiff.Difference change) {
+        return switch (change) {
+            case PROTECTED ->
+                    Localization.lang("Library protection");
+            case GROUPS_ALTERED ->
+                    Localization.lang("Modified groups tree");
+            case ENCODING ->
+                    Localization.lang("Library encoding");
+            case SAVE_SORT_ORDER ->
+                    Localization.lang("Save sort order");
+            case KEY_PATTERNS ->
+                    Localization.lang("Key patterns");
+            case USER_FILE_DIRECTORY ->
+                    Localization.lang("User-specific file directory");
+            case LATEX_FILE_DIRECTORY ->
+                    Localization.lang("LaTeX file directory");
+            case DEFAULT_KEY_PATTERN ->
+                    Localization.lang("Default pattern");
+            case SAVE_ACTIONS ->
+                    Localization.lang("Save actions");
+            case MODE ->
+                    Localization.lang("Library mode");
+            case GENERAL_FILE_DIRECTORY ->
+                    Localization.lang("General file directory");
+            case CONTENT_SELECTOR ->
+                    Localization.lang("Content selectors");
+        };
+    }
 }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
index 4d004e980c3..22384672656 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/CitationKeyPatternPanel.java
@@ -2,8 +2,6 @@
 
 import java.util.Collection;
 
-import javax.inject.Inject;
-
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.fxml.FXML;
@@ -22,6 +20,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class CitationKeyPatternPanel extends TableView<CitationKeyPatternPanelItemModel> {
 
diff --git a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
index cd3d773f6cf..403393cacc8 100644
--- a/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
+++ b/src/main/java/org/jabref/gui/contentselector/ContentSelectorDialogView.java
@@ -3,8 +3,6 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import javax.inject.Inject;
-
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -23,6 +21,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class ContentSelectorDialogView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java b/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java
index c82a3084094..449bdb7602a 100644
--- a/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java
+++ b/src/main/java/org/jabref/gui/customentrytypes/CustomizeEntryTypeDialogView.java
@@ -2,8 +2,6 @@
 
 import java.util.EnumSet;
 
-import javax.inject.Inject;
-
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.fxml.FXML;
@@ -43,6 +41,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 
 public class CustomizeEntryTypeDialogView extends BaseDialog<Void> {
 
@@ -73,6 +72,7 @@ public class CustomizeEntryTypeDialogView extends BaseDialog<Void> {
     private CustomLocalDragboard localDragboard;
 
     public CustomizeEntryTypeDialogView(BibDatabaseContext bibDatabaseContext, BibEntryTypesManager entryTypesManager) {
+        this.setTitle(Localization.lang("Customize entry types"));
         this.mode = bibDatabaseContext.getMode();
         this.entryTypesManager = entryTypesManager;
 
diff --git a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
index 377f158abd6..e75b607e505 100644
--- a/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
+++ b/src/main/java/org/jabref/gui/documentviewer/DocumentViewerView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.documentviewer;
 
-import javax.inject.Inject;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonBar;
@@ -24,6 +22,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class DocumentViewerView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
index fe8112a6829..26fad7eb613 100644
--- a/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
+++ b/src/main/java/org/jabref/gui/edit/ManageKeywordsDialog.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TableColumn;
@@ -21,6 +19,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class ManageKeywordsDialog extends BaseDialog<Void> {
     private final List<BibEntry> entries;
diff --git a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
index 6e3d662bd6e..b0c8111f570 100644
--- a/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
+++ b/src/main/java/org/jabref/gui/entryeditor/EntryEditor.java
@@ -12,8 +12,6 @@
 import java.util.SortedSet;
 import java.util.stream.Collectors;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.geometry.Side;
 import javafx.scene.control.Button;
@@ -60,6 +58,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import com.tobiasdiez.easybind.Subscription;
+import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
index c5384437c51..54f21252406 100644
--- a/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
+++ b/src/main/java/org/jabref/gui/entryeditor/RelatedArticlesTab.java
@@ -65,7 +65,7 @@ private StackPane getRelatedArticlesPane(BibEntry entry) {
         ProgressIndicator progress = new ProgressIndicator();
         progress.setMaxSize(100, 100);
 
-        MrDLibFetcher fetcher = new MrDLibFetcher(preferencesService.getLanguage().name(),
+        MrDLibFetcher fetcher = new MrDLibFetcher(preferencesService.getGeneralPreferences().getLanguage().name(),
                 Globals.BUILD_INFO.version, preferencesService.getMrDlibPreferences());
         BackgroundTask
                 .wrap(() -> fetcher.performSearch(entry))
diff --git a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
index 849a6d1b0ee..24c75fe9aa0 100644
--- a/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
+++ b/src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabView.java
@@ -2,8 +2,6 @@
 
 import java.nio.file.Path;
 
-import javax.inject.Inject;
-
 import javafx.beans.binding.Bindings;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
@@ -28,6 +26,7 @@
 import org.jabref.model.util.FileUpdateMonitor;
 
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class FileAnnotationTabView {
 
diff --git a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
index fa58509d6d2..e29940c7717 100644
--- a/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
+++ b/src/main/java/org/jabref/gui/errorconsole/ErrorConsoleView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.errorconsole;
 
-import javax.inject.Inject;
-
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -30,6 +28,7 @@
 import org.jabref.logic.util.BuildInfo;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class ErrorConsoleView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
index a0b81e63505..d1370c42575 100644
--- a/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
+++ b/src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.exporter;
 
-import javax.inject.Inject;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -14,6 +12,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class CreateModifyExporterDialogView extends BaseDialog<ExporterViewModel> {
 
diff --git a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
index 9ccdfa8ec82..7202751ef5e 100644
--- a/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
+++ b/src/main/java/org/jabref/gui/externalfiles/UnlinkedFilesDialogView.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.externalfiles;
 
-import javax.inject.Inject;
 import javax.swing.undo.UndoManager;
 
 import javafx.application.Platform;
@@ -49,6 +48,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 import org.controlsfx.control.CheckTreeView;
 
 public class UnlinkedFilesDialogView extends BaseDialog<Void> {
diff --git a/src/main/java/org/jabref/gui/help/AboutDialogView.java b/src/main/java/org/jabref/gui/help/AboutDialogView.java
index 2eef63577b9..de23785d378 100644
--- a/src/main/java/org/jabref/gui/help/AboutDialogView.java
+++ b/src/main/java/org/jabref/gui/help/AboutDialogView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.help;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.TextArea;
@@ -14,6 +12,7 @@
 import org.jabref.logic.util.BuildInfo;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class AboutDialogView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
index e88d9878820..a99f090628f 100644
--- a/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialog.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -17,6 +15,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import org.controlsfx.control.CheckListView;
 
 public class ImportCustomEntryTypesDialog extends BaseDialog<Void> {
diff --git a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
index 770d0792659..14406dd642f 100644
--- a/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
+++ b/src/main/java/org/jabref/gui/importer/ImportEntriesDialog.java
@@ -2,7 +2,6 @@
 
 import java.util.EnumSet;
 
-import javax.inject.Inject;
 import javax.swing.undo.UndoManager;
 
 import javafx.beans.binding.Bindings;
@@ -44,6 +43,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import org.controlsfx.control.CheckListView;
 
 public class ImportEntriesDialog extends BaseDialog<Boolean> {
diff --git a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
index 384d49e8887..b6fb218d2f6 100644
--- a/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
+++ b/src/main/java/org/jabref/gui/integrity/IntegrityCheckDialog.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
@@ -21,6 +19,7 @@
 import org.jabref.logic.l10n.Localization;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import org.controlsfx.control.table.TableFilter;
 
 public class IntegrityCheckDialog extends BaseDialog<Void> {
diff --git a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
index b69dd997a4b..f967733b32c 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/AbstractPropertiesTabView.java
@@ -1,13 +1,13 @@
 package org.jabref.gui.libraryproperties;
 
-import javax.inject.Inject;
-
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
 
 import org.jabref.gui.DialogService;
 import org.jabref.model.database.BibDatabaseContext;
 
+import jakarta.inject.Inject;
+
 public abstract class AbstractPropertiesTabView<T extends PropertiesTabViewModel> extends VBox implements PropertiesTab {
 
     @Inject protected DialogService dialogService;
diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
index 78b3b3d2a0a..5286d4fbfbf 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.libraryproperties;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ScrollPane;
@@ -15,6 +13,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class LibraryPropertiesView extends BaseDialog<LibraryPropertiesViewModel> {
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
index 0e83f999963..a6fec6aa7ab 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/constants/ConstantsPropertiesView.java
@@ -2,8 +2,6 @@
 
 import java.util.Optional;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -23,6 +21,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class ConstantsPropertiesView extends AbstractPropertiesTabView<ConstantsPropertiesViewModel> implements PropertiesTab {
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
index 382ca0adf83..6eab2dbee1a 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesView.java
@@ -2,7 +2,6 @@
 
 import java.nio.charset.Charset;
 
-import javax.inject.Inject;
 import javax.swing.undo.UndoManager;
 
 import javafx.fxml.FXML;
@@ -19,6 +18,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class GeneralPropertiesView extends AbstractPropertiesTabView<GeneralPropertiesViewModel> implements PropertiesTab {
     @FXML private ComboBox<Charset> encoding;
diff --git a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
index 74035d4cd03..4d915d5099c 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/keypattern/KeyPatternPropertiesView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.libraryproperties.keypattern;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 
@@ -19,6 +17,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class KeyPatternPropertiesView extends AbstractPropertiesTabView<KeyPatternPropertiesViewModel> implements PropertiesTab {
 
diff --git a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
index b479ee23cf6..524a051e20b 100644
--- a/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
+++ b/src/main/java/org/jabref/gui/libraryproperties/saving/SavingPropertiesView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.libraryproperties.saving;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 
@@ -14,6 +12,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class SavingPropertiesView extends AbstractPropertiesTabView<SavingPropertiesViewModel> implements PropertiesTab {
 
diff --git a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
index 3d6149a203b..7a9c333d0a2 100644
--- a/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
+++ b/src/main/java/org/jabref/gui/linkedfile/LinkedFileEditDialogView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.linkedfile;
 
-import javax.inject.Inject;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
@@ -18,6 +16,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class LinkedFileEditDialogView extends BaseDialog<LinkedFile> {
 
diff --git a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
index 43a80641bf1..23554b66fc6 100644
--- a/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
+++ b/src/main/java/org/jabref/gui/menus/FileHistoryMenu.java
@@ -11,22 +11,19 @@
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.io.FileHistory;
-import org.jabref.preferences.PreferencesService;
 
 public class FileHistoryMenu extends Menu {
 
     private final FileHistory history;
-    private final PreferencesService preferences;
     private final DialogService dialogService;
     private final OpenDatabaseAction openDatabaseAction;
 
-    public FileHistoryMenu(PreferencesService preferences, DialogService dialogService, OpenDatabaseAction openDatabaseAction) {
+    public FileHistoryMenu(FileHistory fileHistory, DialogService dialogService, OpenDatabaseAction openDatabaseAction) {
         setText(Localization.lang("Recent libraries"));
 
-        this.preferences = preferences;
+        this.history = fileHistory;
         this.dialogService = dialogService;
         this.openDatabaseAction = openDatabaseAction;
-        history = preferences.getGuiPreferences().getFileHistory();
         if (history.isEmpty()) {
             setDisable(true);
         } else {
@@ -46,10 +43,10 @@ public boolean openFileByKey(KeyEvent keyEvent) {
         }
         char key = keyEvent.getCharacter().charAt(0);
         int num = Character.getNumericValue(key);
-        if (num <= 0 || num > history.getHistory().size()) {
+        if (num <= 0 || num > history.size()) {
             return false;
         }
-        this.openFile(history.getFileAt(Integer.parseInt(keyEvent.getCharacter()) - 1));
+        this.openFile(history.get(Integer.parseInt(keyEvent.getCharacter()) - 1));
         return true;
     }
 
@@ -66,7 +63,7 @@ public void newFile(Path file) {
     private void setItems() {
         getItems().clear();
         for (int index = 0; index < history.size(); index++) {
-            addItem(history.getFileAt(index), index + 1);
+            addItem(history.get(index), index + 1);
         }
     }
 
diff --git a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
index f0453231015..15bc0def40a 100644
--- a/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/ManageCitationsDialogView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.openoffice;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.ButtonType;
@@ -19,6 +17,7 @@
 import org.jabref.model.strings.StringUtil;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class ManageCitationsDialogView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
index 2b66e0f6013..77870845ba8 100644
--- a/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
+++ b/src/main/java/org/jabref/gui/openoffice/StyleSelectDialogView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.openoffice;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -30,6 +28,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class StyleSelectDialogView extends BaseDialog<OOBibStyle> {
 
diff --git a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
index 354d6a5457a..61ea82243fa 100644
--- a/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/AbstractPreferenceTabView.java
@@ -2,8 +2,6 @@
 
 import java.util.List;
 
-import javax.inject.Inject;
-
 import javafx.scene.Node;
 import javafx.scene.layout.VBox;
 
@@ -11,6 +9,8 @@
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.preferences.PreferencesService;
 
+import jakarta.inject.Inject;
+
 public abstract class AbstractPreferenceTabView<T extends PreferenceTabViewModel> extends VBox implements PreferencesTab {
 
     @Inject protected TaskExecutor taskExecutor;
diff --git a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
index 4615300d502..a4bb0baab0c 100644
--- a/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
+++ b/src/main/java/org/jabref/gui/preferences/PreferencesDialogView.java
@@ -2,8 +2,6 @@
 
 import java.util.Locale;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.ListView;
@@ -21,6 +19,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import org.controlsfx.control.textfield.CustomTextField;
 
 /**
diff --git a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
index 6021a2c5a51..7d5f40b6e49 100644
--- a/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
+++ b/src/main/java/org/jabref/gui/preferences/customexporter/CustomExporterTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences.customexporter;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TableColumn;
@@ -15,6 +13,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class CustomExporterTab extends AbstractPreferenceTabView<CustomExporterTabViewModel> implements PreferencesTab {
 
diff --git a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
index 377291e96e4..e18ed5a4e83 100644
--- a/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
+++ b/src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
-import javax.inject.Inject;
-
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -18,6 +16,7 @@
 import org.jabref.gui.util.FileDialogConfiguration;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index 68ea3b24c7a..6e2143f31c4 100644
--- a/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -68,7 +68,7 @@ public GeneralTabViewModel(DialogService dialogService, PreferencesService prefe
 
     public void setValues() {
         languagesListProperty.setValue(new SortedList<>(FXCollections.observableArrayList(Language.values()), Comparator.comparing(Language::getDisplayName)));
-        selectedLanguageProperty.setValue(preferencesService.getLanguage());
+        selectedLanguageProperty.setValue(preferencesService.getGeneralPreferences().getLanguage());
 
         encodingsListProperty.setValue(FXCollections.observableArrayList(Encodings.getCharsets()));
 
@@ -91,8 +91,8 @@ public void setValues() {
 
     public void storeSettings() {
         Language newLanguage = selectedLanguageProperty.getValue();
-        if (newLanguage != preferencesService.getLanguage()) {
-            preferencesService.setLanguage(newLanguage);
+        if (newLanguage != preferencesService.getGeneralPreferences().getLanguage()) {
+            preferencesService.getGeneralPreferences().setLanguage(newLanguage);
             Localization.setLanguage(newLanguage);
             restartWarning.add(Localization.lang("Changed language") + ": " + newLanguage.getDisplayName());
         }
diff --git a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
index 32733480c77..37bda9ad270 100644
--- a/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/journals/JournalAbbreviationsTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences.journals;
 
-import javax.inject.Inject;
-
 import javafx.animation.Interpolator;
 import javafx.animation.KeyFrame;
 import javafx.animation.KeyValue;
@@ -34,6 +32,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 import org.controlsfx.control.textfield.CustomTextField;
 
 /**
diff --git a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
index eaa7f68ac5e..c4c04fe86c8 100644
--- a/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/keybindings/KeyBindingsTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences.keybindings;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.MenuButton;
 import javafx.scene.control.MenuItem;
@@ -22,6 +20,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class KeyBindingsTab extends AbstractPreferenceTabView<KeyBindingsTabViewModel> implements PreferencesTab {
 
diff --git a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
index cb9c897455c..fa7d3995d0e 100644
--- a/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
+++ b/src/main/java/org/jabref/gui/preferences/preview/PreviewTab.java
@@ -3,8 +3,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.inject.Inject;
-
 import javafx.application.Platform;
 import javafx.beans.property.ListProperty;
 import javafx.fxml.FXML;
@@ -42,6 +40,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 import org.controlsfx.control.textfield.CustomTextField;
 import org.fxmisc.richtext.CodeArea;
 import org.fxmisc.richtext.LineNumberFactory;
diff --git a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
index b5285f5e07c..c5d1aa5b2c5 100644
--- a/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
+++ b/src/main/java/org/jabref/gui/preferences/protectedterms/ProtectedTermsTab.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.preferences.protectedterms;
 
-import javax.inject.Inject;
-
 import javafx.beans.property.ReadOnlyBooleanWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.ContextMenu;
@@ -24,6 +22,7 @@
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 
 /**
  * Dialog for managing term list files.
diff --git a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
index b23dc8ab2df..1b330015949 100644
--- a/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
+++ b/src/main/java/org/jabref/gui/search/GlobalSearchResultDialog.java
@@ -1,6 +1,5 @@
 package org.jabref.gui.search;
 
-import javax.inject.Inject;
 import javax.swing.undo.UndoManager;
 
 import javafx.fxml.FXML;
@@ -21,6 +20,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class GlobalSearchResultDialog extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
index 52e9280f2e7..992ed0482b0 100644
--- a/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
+++ b/src/main/java/org/jabref/gui/shared/SharedDatabaseLoginDialogView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.shared;
 
-import javax.inject.Inject;
-
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -24,6 +22,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 
 public class SharedDatabaseLoginDialogView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
index 5040015fa3d..db9e074a596 100644
--- a/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
+++ b/src/main/java/org/jabref/gui/slr/ManageStudyDefinitionView.java
@@ -5,8 +5,6 @@
 import java.util.StringJoiner;
 import java.util.function.Consumer;
 
-import javax.inject.Inject;
-
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.fxml.FXML;
@@ -35,6 +33,7 @@
 import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
+import jakarta.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
index ce8dfd215f1..6f95e828754 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
@@ -1,7 +1,5 @@
 package org.jabref.gui.texparser;
 
-import javax.inject.Inject;
-
 import javafx.beans.binding.Bindings;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -28,6 +26,7 @@
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
+import jakarta.inject.Inject;
 import org.controlsfx.control.CheckTreeView;
 
 public class ParseLatexDialogView extends BaseDialog<Void> {
diff --git a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
index 6a56fbcfe47..7fc00e8b7eb 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
@@ -2,8 +2,6 @@
 
 import java.nio.file.Path;
 
-import javax.inject.Inject;
-
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -20,6 +18,7 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import com.tobiasdiez.easybind.EasyBind;
+import jakarta.inject.Inject;
 
 public class ParseLatexResultView extends BaseDialog<Void> {
 
diff --git a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
index 7a3c5db3ba0..09c639e6e64 100644
--- a/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
+++ b/src/main/java/org/jabref/logic/bibtex/comparator/MetaDataDiff.java
@@ -1,15 +1,27 @@
 package org.jabref.logic.bibtex.comparator;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.EnumSet;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.jabref.logic.l10n.Localization;
 import org.jabref.model.metadata.MetaData;
 import org.jabref.preferences.PreferencesService;
 
 public class MetaDataDiff {
+    public enum Difference {
+        PROTECTED,
+        GROUPS_ALTERED,
+        ENCODING,
+        SAVE_SORT_ORDER,
+        KEY_PATTERNS,
+        USER_FILE_DIRECTORY,
+        LATEX_FILE_DIRECTORY,
+        DEFAULT_KEY_PATTERN,
+        SAVE_ACTIONS,
+        MODE,
+        GENERAL_FILE_DIRECTORY,
+        CONTENT_SELECTOR
+    }
 
     private final Optional<GroupDiff> groupDiff;
     private final MetaData originalMetaData;
@@ -32,44 +44,44 @@ public static Optional<MetaDataDiff> compare(MetaData originalMetaData, MetaData
     /**
      * @implNote Should be kept in sync with {@link MetaData#equals(Object)}
      */
-    public List<String> getDifferences(PreferencesService preferences) {
-        List<String> changes = new ArrayList<>();
+    public EnumSet<Difference> getDifferences(PreferencesService preferences) {
+        EnumSet<Difference> changes = EnumSet.noneOf(Difference.class);
 
         if (originalMetaData.isProtected() != newMetaData.isProtected()) {
-            changes.add(Localization.lang("Library protection"));
+            changes.add(Difference.PROTECTED);
         }
         if (!Objects.equals(originalMetaData.getGroups(), newMetaData.getGroups())) {
-            changes.add(Localization.lang("Modified groups tree"));
+            changes.add(Difference.GROUPS_ALTERED);
         }
         if (!Objects.equals(originalMetaData.getEncoding(), newMetaData.getEncoding())) {
-            changes.add(Localization.lang("Library encoding"));
+            changes.add(Difference.ENCODING);
         }
         if (!Objects.equals(originalMetaData.getSaveOrderConfig(), newMetaData.getSaveOrderConfig())) {
-            changes.add(Localization.lang("Save sort order"));
+            changes.add(Difference.SAVE_SORT_ORDER);
         }
         if (!Objects.equals(originalMetaData.getCiteKeyPattern(preferences.getGlobalCitationKeyPattern()), newMetaData.getCiteKeyPattern(preferences.getGlobalCitationKeyPattern()))) {
-            changes.add(Localization.lang("Key patterns"));
+            changes.add(Difference.KEY_PATTERNS);
         }
         if (!Objects.equals(originalMetaData.getUserFileDirectories(), newMetaData.getUserFileDirectories())) {
-            changes.add(Localization.lang("User-specific file directory"));
+            changes.add(Difference.USER_FILE_DIRECTORY);
         }
         if (!Objects.equals(originalMetaData.getLatexFileDirectories(), newMetaData.getLatexFileDirectories())) {
-            changes.add(Localization.lang("LaTeX file directory"));
+            changes.add(Difference.LATEX_FILE_DIRECTORY);
         }
         if (!Objects.equals(originalMetaData.getDefaultCiteKeyPattern(), newMetaData.getDefaultCiteKeyPattern())) {
-            changes.add(Localization.lang("Default pattern"));
+            changes.add(Difference.DEFAULT_KEY_PATTERN);
         }
         if (!Objects.equals(originalMetaData.getSaveActions(), newMetaData.getSaveActions())) {
-            changes.add(Localization.lang("Save actions"));
+            changes.add(Difference.SAVE_ACTIONS);
         }
-        if (originalMetaData.getMode() != newMetaData.getMode()) {
-            changes.add(Localization.lang("Library mode"));
+        if (!originalMetaData.getMode().equals(newMetaData.getMode())) {
+            changes.add(Difference.MODE);
         }
         if (!Objects.equals(originalMetaData.getDefaultFileDirectory(), newMetaData.getDefaultFileDirectory())) {
-            changes.add(Localization.lang("General file directory"));
+            changes.add(Difference.GENERAL_FILE_DIRECTORY);
         }
         if (!Objects.equals(originalMetaData.getContentSelectors(), newMetaData.getContentSelectors())) {
-            changes.add(Localization.lang("Content selectors"));
+            changes.add(Difference.CONTENT_SELECTOR);
         }
         return changes;
     }
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
index 0d1cf5c5ad6..3696ac294ae 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanup.java
@@ -57,7 +57,7 @@ private List<FieldChange> cleanupSingleField(Field fieldKey, BibEntry entry) {
         // Run formatter
         String newValue = formatter.format(oldValue);
 
-        if (oldValue.equals(newValue)) {
+        if (newValue.equals(oldValue)) {
             return Collections.emptyList();
         } else {
             if (newValue.isEmpty()) {
@@ -86,7 +86,7 @@ private List<FieldChange> cleanupAllFields(BibEntry entry) {
     private List<FieldChange> cleanupAllTextFields(BibEntry entry) {
         List<FieldChange> fieldChanges = new ArrayList<>();
         Set<Field> fields = new HashSet<>(entry.getFields());
-        fields.removeAll(FieldFactory.getNotTextFieldNames());
+        FieldFactory.getNotTextFieldNames().forEach(fields::remove);
         for (Field fieldKey : fields) {
             if (!fieldKey.equals(InternalField.KEY_FIELD)) {
                 fieldChanges.addAll(cleanupSingleField(fieldKey, entry));
@@ -105,12 +105,11 @@ public Formatter getFormatter() {
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) {
+    public boolean equals(Object obj) {
+        if (this == obj) {
             return true;
         }
-        if (o instanceof FieldFormatterCleanup) {
-            FieldFormatterCleanup that = (FieldFormatterCleanup) o;
+        if (obj instanceof FieldFormatterCleanup that) {
             return Objects.equals(field, that.field) && Objects.equals(formatter, that.formatter);
         }
         return false;
diff --git a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
index ce53b68d144..17e88ab6955 100644
--- a/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
+++ b/src/main/java/org/jabref/logic/cleanup/FieldFormatterCleanups.java
@@ -206,4 +206,28 @@ private static Formatter getFormatterFromString(String formatterName) {
         }
         return new IdentityFormatter();
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(actions, enabled);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj instanceof FieldFormatterCleanups other) {
+            return Objects.equals(actions, other.actions) && (enabled == other.enabled);
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "FieldFormatterCleanups{" +
+                "enabled=" + enabled + "," +
+                "actions=" + actions +
+                "}";
+    }
 }
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java b/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java
index 01a7a6d5fc2..86b6861ae4e 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatter.java
@@ -22,7 +22,7 @@ public String getKey() {
     public String format(String input) {
         Title title = new Title(input);
 
-        title.getWords().stream().forEach(Word::toUpperFirst);
+        title.getWords().stream().forEach(Word::toUpperFirstIgnoreHyphen);
 
         return title.toString();
     }
diff --git a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
index 9cf9dd77ea9..5c777df9a00 100644
--- a/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
+++ b/src/main/java/org/jabref/logic/formatter/casechanger/Word.java
@@ -102,6 +102,16 @@ public void toUpperFirst() {
         }
     }
 
+    public void toUpperFirstIgnoreHyphen() {
+        for (int i = 0; i < chars.length; i++) {
+            if (!protectedChars[i]) {
+                chars[i] = (i == 0 || (DASHES.contains(chars[i - 1]))) ?
+                        Character.toUpperCase(chars[i]) :
+                        Character.toLowerCase(chars[i]);
+            }
+        }
+    }
+
     public void toUpperFirstTitle() {
         for (int i = 0; i < chars.length; i++) {
             if (!protectedChars[i]) {
diff --git a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
index 69ebd404f14..052578f7657 100644
--- a/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
+++ b/src/main/java/org/jabref/logic/importer/fileformat/ModsImporter.java
@@ -9,6 +9,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
@@ -167,7 +168,7 @@ private void parseModsGroup(Map<Field, String> fields, List<Object> modsGroup, B
             abstractDefinition
                     .ifPresent(abstractDef -> putIfValueNotNull(fields, StandardField.ABSTRACT, abstractDef.getValue()));
 
-            genreDefinition.ifPresent(genre -> entry.setType(EntryTypeFactory.parse(genre.getValue())));
+            genreDefinition.ifPresent(genre -> entry.setType(EntryTypeFactory.parse(mapGenre(genre.getValue()))));
 
             languageDefinition.ifPresent(
                     languageDef -> languageDef.getLanguageTerm().stream().map(LanguageTermDefinition::getValue)
@@ -203,6 +204,16 @@ private void parseModsGroup(Map<Field, String> fields, List<Object> modsGroup, B
         putIfListIsNotEmpty(fields, notes, StandardField.NOTE, ", ");
     }
 
+    private String mapGenre(String genre) {
+        return switch (genre.toLowerCase(Locale.ROOT)) {
+            case "conference publication" -> "proceedings";
+            case "database" -> "dataset";
+            case "yearbook", "handbook" -> "book";
+            case "law report or digest", "technical report", "reporting" -> "report";
+            default -> genre;
+        };
+    }
+
     private void parseTitle(Map<Field, String> fields, List<Object> titleOrSubTitleOrPartNumber) {
         for (Object object : titleOrSubTitleOrPartNumber) {
             if (object instanceof JAXBElement) {
diff --git a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java b/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
index 89db6837ce9..831ca747cb1 100644
--- a/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
+++ b/src/main/java/org/jabref/logic/pdf/search/indexing/DocumentReader.java
@@ -71,11 +71,7 @@ public DocumentReader(BibEntry bibEntry, FilePreferences filePreferences) {
     public Optional<List<Document>> readLinkedPdf(BibDatabaseContext databaseContext, LinkedFile pdf) {
         Optional<Path> pdfPath = pdf.findIn(databaseContext, filePreferences);
         if (pdfPath.isPresent()) {
-            try {
-                return Optional.of(readPdfContents(pdf, pdfPath.get()));
-            } catch (IOException e) {
-                LOGGER.error("Could not read pdf file {}!", pdf.getLink(), e);
-            }
+            return Optional.of(readPdfContents(pdf, pdfPath.get()));
         }
         return Optional.empty();
     }
@@ -94,19 +90,30 @@ public List<Document> readLinkedPdfs(BibDatabaseContext databaseContext) {
                     .collect(Collectors.toList());
     }
 
-    private List<Document> readPdfContents(LinkedFile pdf, Path resolvedPdfPath) throws IOException {
+    private List<Document> readPdfContents(LinkedFile pdf, Path resolvedPdfPath) {
+        List<Document> pages = new ArrayList<>();
         try (PDDocument pdfDocument = Loader.loadPDF(resolvedPdfPath.toFile())) {
-            List<Document> pages = new ArrayList<>();
-
-            for (int pageNumber = 0; pageNumber < pdfDocument.getNumberOfPages(); pageNumber++) {
-                Document newDocument = new Document();
-                addIdentifiers(newDocument, pdf.getLink());
-                addMetaData(newDocument, resolvedPdfPath, pageNumber);
-                addContentIfNotEmpty(pdfDocument, newDocument, pageNumber);
-                pages.add(newDocument);
-            }
-            return pages;
+                for (int pageNumber = 0; pageNumber < pdfDocument.getNumberOfPages(); pageNumber++) {
+                    Document newDocument = new Document();
+                    addIdentifiers(newDocument, pdf.getLink());
+                    addMetaData(newDocument, resolvedPdfPath, pageNumber);
+                    try {
+                        addContentIfNotEmpty(pdfDocument, newDocument, pageNumber);
+                    } catch (IOException e) {
+                        LOGGER.warn("Could not read page {} of  {}", pageNumber, resolvedPdfPath.toAbsolutePath(), e);
+                    }
+                    pages.add(newDocument);
+                }
+        } catch (IOException e) {
+            LOGGER.warn("Could not read {}", resolvedPdfPath.toAbsolutePath(), e);
+        }
+        if (pages.isEmpty()) {
+            Document newDocument = new Document();
+            addIdentifiers(newDocument, pdf.getLink());
+            addMetaData(newDocument, resolvedPdfPath, 0);
+            pages.add(newDocument);
         }
+        return pages;
     }
 
     private void addMetaData(Document newDocument, Path resolvedPdfPath, int pageNumber) {
@@ -135,24 +142,20 @@ public static String mergeLines(String text) {
         return LINEBREAK_WITHOUT_PERIOD_PATTERN.matcher(mergedHyphenNewlines).replaceAll("$1 ");
     }
 
-    private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument, int pageNumber) {
-        try {
-            PDFTextStripper pdfTextStripper = new PDFTextStripper();
-            pdfTextStripper.setLineSeparator("\n");
-            pdfTextStripper.setStartPage(pageNumber);
-            pdfTextStripper.setEndPage(pageNumber);
-
-            String pdfContent = pdfTextStripper.getText(pdfDocument);
-            if (StringUtil.isNotBlank(pdfContent)) {
-                newDocument.add(new TextField(CONTENT, mergeLines(pdfContent), Field.Store.YES));
-            }
-            PDPage page = pdfDocument.getPage(pageNumber);
-            List<String> annotations = page.getAnnotations().stream().filter((annotation) -> annotation.getContents() != null).map(PDAnnotation::getContents).collect(Collectors.toList());
-            if (annotations.size() > 0) {
-                newDocument.add(new TextField(ANNOTATIONS, annotations.stream().collect(Collectors.joining("\n")), Field.Store.YES));
-            }
-        } catch (IOException e) {
-            LOGGER.info("Could not read contents of PDF document \"{}\"", pdfDocument.toString(), e);
+    private void addContentIfNotEmpty(PDDocument pdfDocument, Document newDocument, int pageNumber) throws IOException {
+        PDFTextStripper pdfTextStripper = new PDFTextStripper();
+        pdfTextStripper.setLineSeparator("\n");
+        pdfTextStripper.setStartPage(pageNumber);
+        pdfTextStripper.setEndPage(pageNumber);
+
+        String pdfContent = pdfTextStripper.getText(pdfDocument);
+        if (StringUtil.isNotBlank(pdfContent)) {
+            newDocument.add(new TextField(CONTENT, mergeLines(pdfContent), Field.Store.YES));
+        }
+        PDPage page = pdfDocument.getPage(pageNumber);
+        List<String> annotations = page.getAnnotations().stream().filter((annotation) -> annotation.getContents() != null).map(PDAnnotation::getContents).collect(Collectors.toList());
+        if (annotations.size() > 0) {
+            newDocument.add(new TextField(ANNOTATIONS, annotations.stream().collect(Collectors.joining("\n")), Field.Store.YES));
         }
     }
 
diff --git a/src/main/java/org/jabref/logic/util/io/FileHistory.java b/src/main/java/org/jabref/logic/util/io/FileHistory.java
index 04af2003c92..4281c36306e 100644
--- a/src/main/java/org/jabref/logic/util/io/FileHistory.java
+++ b/src/main/java/org/jabref/logic/util/io/FileHistory.java
@@ -1,28 +1,43 @@
 package org.jabref.logic.util.io;
 
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
+import javafx.collections.ModifiableObservableListBase;
 
-public class FileHistory {
+public class FileHistory extends ModifiableObservableListBase<Path> {
 
     private static final int HISTORY_SIZE = 8;
 
-    private final ObservableList<Path> history;
+    private final List<Path> history;
 
-    public FileHistory(List<Path> files) {
-        history = FXCollections.observableList(Objects.requireNonNull(files));
+    private FileHistory(List<Path> list) {
+        history = new ArrayList<>(list);
+    }
+
+    @Override
+    public Path get(int index) {
+        return history.get(index);
     }
 
     public int size() {
         return history.size();
     }
 
-    public boolean isEmpty() {
-        return history.isEmpty();
+    @Override
+    protected void doAdd(int index, Path element) {
+        history.add(index, element);
+    }
+
+    @Override
+    protected Path doSet(int index, Path element) {
+        return history.set(index, element);
+    }
+
+    @Override
+    protected Path doRemove(int index) {
+        return history.remove(index);
     }
 
     /**
@@ -30,21 +45,17 @@ public boolean isEmpty() {
      */
     public void newFile(Path file) {
         removeItem(file);
-        history.add(0, file);
+        this.add(0, file);
         while (size() > HISTORY_SIZE) {
             history.remove(HISTORY_SIZE);
         }
     }
 
-    public Path getFileAt(int index) {
-        return history.get(index);
-    }
-
     public void removeItem(Path file) {
-        history.remove(file);
+        this.remove(file);
     }
 
-    public ObservableList<Path> getHistory() {
-        return history;
+    public static FileHistory of(List<Path> list) {
+        return new FileHistory(new ArrayList<>(list));
     }
 }
diff --git a/src/main/java/org/jabref/model/metadata/ContentSelector.java b/src/main/java/org/jabref/model/metadata/ContentSelector.java
index 1d51a893aa9..d2c633f6396 100644
--- a/src/main/java/org/jabref/model/metadata/ContentSelector.java
+++ b/src/main/java/org/jabref/model/metadata/ContentSelector.java
@@ -26,7 +26,7 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if ((o == null) || (getClass() != o.getClass())) {
             return false;
         }
 
@@ -35,6 +35,11 @@ public boolean equals(Object o) {
                 Objects.equals(values, that.values);
     }
 
+    @Override
+    public String toString() {
+        return "ContentSelector [field=" + field + ", values=" + values + "]";
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(field, values);
diff --git a/src/main/java/org/jabref/model/metadata/MetaData.java b/src/main/java/org/jabref/model/metadata/MetaData.java
index 9b0ed2ae856..531ac1985be 100644
--- a/src/main/java/org/jabref/model/metadata/MetaData.java
+++ b/src/main/java/org/jabref/model/metadata/MetaData.java
@@ -375,7 +375,12 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(groupsRoot.getValue(), encoding, encodingExplicitlySupplied, saveOrderConfig, citeKeyPatterns, userFileDirectory,
-                defaultCiteKeyPattern, saveActions, mode, isProtected, defaultFileDirectory);
+        return Objects.hash(isProtected, groupsRoot.getValue(), encoding, encodingExplicitlySupplied, saveOrderConfig, citeKeyPatterns, userFileDirectory,
+                laTexFileDirectory, defaultCiteKeyPattern, saveActions, mode, defaultFileDirectory, contentSelectors);
+    }
+
+    @Override
+    public String toString() {
+        return "MetaData [citeKeyPatterns=" + citeKeyPatterns + ", userFileDirectory=" + userFileDirectory + ", laTexFileDirectory=" + laTexFileDirectory + ", groupsRoot=" + groupsRoot + ", encoding=" + encoding + ", saveOrderConfig=" + saveOrderConfig + ", defaultCiteKeyPattern=" + defaultCiteKeyPattern + ", saveActions=" + saveActions + ", mode=" + mode + ", isProtected=" + isProtected + ", defaultFileDirectory=" + defaultFileDirectory + ", contentSelectors=" + contentSelectors + ", encodingExplicitlySupplied=" + encodingExplicitlySupplied + "]";
     }
 }
diff --git a/src/main/java/org/jabref/preferences/GeneralPreferences.java b/src/main/java/org/jabref/preferences/GeneralPreferences.java
index 1383e6c11b4..62d4971a6d6 100644
--- a/src/main/java/org/jabref/preferences/GeneralPreferences.java
+++ b/src/main/java/org/jabref/preferences/GeneralPreferences.java
@@ -5,9 +5,11 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 
+import org.jabref.logic.l10n.Language;
 import org.jabref.model.database.BibDatabaseMode;
 
 public class GeneralPreferences {
+    private final ObjectProperty<Language> language;
     private final ObjectProperty<BibDatabaseMode> defaultBibDatabaseMode;
     private final BooleanProperty warnAboutDuplicatesInInspection;
     private final BooleanProperty confirmDelete;
@@ -15,11 +17,13 @@ public class GeneralPreferences {
     private final BooleanProperty memoryStickMode;
     private final BooleanProperty showAdvancedHints;
 
-    public GeneralPreferences(BibDatabaseMode defaultBibDatabaseMode,
+    public GeneralPreferences(Language language,
+                              BibDatabaseMode defaultBibDatabaseMode,
                               boolean warnAboutDuplicatesInInspection,
                               boolean confirmDelete,
                               boolean memoryStickMode,
                               boolean showAdvancedHints) {
+        this.language = new SimpleObjectProperty<>(language);
         this.defaultBibDatabaseMode = new SimpleObjectProperty<>(defaultBibDatabaseMode);
         this.warnAboutDuplicatesInInspection = new SimpleBooleanProperty(warnAboutDuplicatesInInspection);
         this.confirmDelete = new SimpleBooleanProperty(confirmDelete);
@@ -28,6 +32,18 @@ public GeneralPreferences(BibDatabaseMode defaultBibDatabaseMode,
         this.showAdvancedHints = new SimpleBooleanProperty(showAdvancedHints);
     }
 
+    public Language getLanguage() {
+        return language.get();
+    }
+
+    public ObjectProperty<Language> languageProperty() {
+        return language;
+    }
+
+    public void setLanguage(Language language) {
+        this.language.set(language);
+    }
+
     public BibDatabaseMode getDefaultBibDatabaseMode() {
         return defaultBibDatabaseMode.get();
     }
diff --git a/src/main/java/org/jabref/preferences/GuiPreferences.java b/src/main/java/org/jabref/preferences/GuiPreferences.java
index 08f9e199c84..b8ca00d69d0 100644
--- a/src/main/java/org/jabref/preferences/GuiPreferences.java
+++ b/src/main/java/org/jabref/preferences/GuiPreferences.java
@@ -25,14 +25,14 @@ public class GuiPreferences {
 
     private final BooleanProperty windowMaximised;
 
+    // the last libraries that were open when jabref closes and should be reopened on startup
     private final ObservableList<String> lastFilesOpened;
     private final ObjectProperty<Path> lastFocusedFile;
+    // observable list last files opened in the file menu
     private final FileHistory fileHistory;
 
     private final StringProperty lastSelectedIdBasedFetcher;
-
     private final ObjectProperty<DiffMode> mergeDiffMode;
-
     private final DoubleProperty sidePaneWidth;
 
     public GuiPreferences(double positionX,
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 4f50fe85351..166e5d9f187 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -34,6 +34,7 @@
 import java.util.stream.Stream;
 
 import javafx.beans.InvalidationListener;
+import javafx.collections.ListChangeListener;
 import javafx.collections.SetChangeListener;
 import javafx.scene.control.TableColumn.SortType;
 
@@ -414,7 +415,6 @@ public class JabRefPreferences implements PreferencesService {
     /**
      * Cache variables
      */
-    private Language language;
     private GeneralPreferences generalPreferences;
     private TelemetryPreferences telemetryPreferences;
     private DOIPreferences doiPreferences;
@@ -1254,33 +1254,6 @@ private void storeBibEntryTypes(Collection<BibEntryType> bibEntryTypes, BibDatab
     // GeneralPreferences
     //*************************************************************************************************************
 
-    @Override
-    public Language getLanguage() {
-        if (language == null) {
-            updateLanguage();
-        }
-        return language;
-    }
-
-    private void updateLanguage() {
-        String languageId = get(LANGUAGE);
-        language = Stream.of(Language.values())
-                         .filter(language -> language.getId().equalsIgnoreCase(languageId))
-                         .findFirst()
-                         .orElse(Language.ENGLISH);
-    }
-
-    @Override
-    public void setLanguage(Language language) {
-        Language oldLanguage = getLanguage();
-        put(LANGUAGE, language.getId());
-        if (language != oldLanguage) {
-            // Update any defaults that might be language dependent:
-            setLanguageDependentDefaultValues();
-        }
-        updateLanguage();
-    }
-
     @Override
     public GeneralPreferences getGeneralPreferences() {
         if (Objects.nonNull(generalPreferences)) {
@@ -1288,12 +1261,20 @@ public GeneralPreferences getGeneralPreferences() {
         }
 
         generalPreferences = new GeneralPreferences(
+                getLanguage(),
                 getBoolean(BIBLATEX_DEFAULT_MODE) ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX,
                 getBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION),
                 getBoolean(CONFIRM_DELETE),
                 getBoolean(MEMORY_STICK_MODE),
                 getBoolean(SHOW_ADVANCED_HINTS));
 
+        EasyBind.listen(generalPreferences.languageProperty(), (obs, oldValue, newValue) -> {
+            put(LANGUAGE, newValue.getId());
+            if (oldValue != newValue) {
+                setLanguageDependentDefaultValues();
+                Localization.setLanguage(newValue);
+            }
+        });
         EasyBind.listen(generalPreferences.defaultBibDatabaseModeProperty(), (obs, oldValue, newValue) -> putBoolean(BIBLATEX_DEFAULT_MODE, (newValue == BibDatabaseMode.BIBLATEX)));
         EasyBind.listen(generalPreferences.isWarnAboutDuplicatesInInspectionProperty(), (obs, oldValue, newValue) -> putBoolean(WARN_ABOUT_DUPLICATES_IN_INSPECTION, newValue));
         EasyBind.listen(generalPreferences.confirmDeleteProperty(), (obs, oldValue, newValue) -> putBoolean(CONFIRM_DELETE, newValue));
@@ -1303,6 +1284,13 @@ public GeneralPreferences getGeneralPreferences() {
         return generalPreferences;
     }
 
+    private Language getLanguage() {
+        return Stream.of(Language.values())
+                     .filter(language -> language.getId().equalsIgnoreCase(get(LANGUAGE)))
+                     .findFirst()
+                     .orElse(Language.ENGLISH);
+    }
+
     @Override
     public TelemetryPreferences getTelemetryPreferences() {
         if (Objects.nonNull(telemetryPreferences)) {
@@ -1312,7 +1300,7 @@ public TelemetryPreferences getTelemetryPreferences() {
         telemetryPreferences = new TelemetryPreferences(
                 getBoolean(COLLECT_TELEMETRY),
                 !getBoolean(ALREADY_ASKED_TO_COLLECT_TELEMETRY), // mind the !
-                getOrCreateUserId()
+                getTelemetryUserId()
         );
 
         EasyBind.listen(telemetryPreferences.collectTelemetryProperty(), (obs, oldValue, newValue) -> putBoolean(COLLECT_TELEMETRY, newValue));
@@ -1321,7 +1309,7 @@ public TelemetryPreferences getTelemetryPreferences() {
         return telemetryPreferences;
     }
 
-    private String getOrCreateUserId() {
+    private String getTelemetryUserId() {
         Optional<String> userId = getAsOptional(USER_ID);
         if (userId.isPresent()) {
             return userId.get();
@@ -2202,7 +2190,7 @@ private String determineMainFileDirectory(String originalDirectory) {
             // A non-empty directory is kept
             return originalDirectory;
         }
-        return JabRefDesktop.getDefaultFileChooserDirectory().toString();
+        return JabRefDesktop.getDefaultFileChooserDirectory();
     }
 
     @Override
@@ -2574,8 +2562,13 @@ public GuiPreferences getGuiPreferences() {
         EasyBind.listen(guiPreferences.sizeXProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_X, newValue.doubleValue()));
         EasyBind.listen(guiPreferences.sizeYProperty(), (obs, oldValue, newValue) -> putDouble(SIZE_Y, newValue.doubleValue()));
         EasyBind.listen(guiPreferences.windowMaximisedProperty(), (obs, oldValue, newValue) -> putBoolean(WINDOW_MAXIMISED, newValue));
-        guiPreferences.getLastFilesOpened().addListener((InvalidationListener) change ->
-                putStringList(LAST_EDITED, guiPreferences.getLastFilesOpened()));
+        guiPreferences.getLastFilesOpened().addListener((ListChangeListener<String>) change -> {
+            if (change.getList().isEmpty()) {
+                prefs.remove(LAST_EDITED);
+            } else {
+                putStringList(LAST_EDITED, guiPreferences.getLastFilesOpened());
+            }
+        });
         EasyBind.listen(guiPreferences.lastFocusedFileProperty(), (obs, oldValue, newValue) -> {
             if (newValue != null) {
                 put(LAST_FOCUSED, newValue.toAbsolutePath().toString());
@@ -2583,7 +2576,7 @@ public GuiPreferences getGuiPreferences() {
                 remove(LAST_EDITED);
             }
         });
-        guiPreferences.getFileHistory().getHistory().addListener((InvalidationListener) change -> storeFileHistory(guiPreferences.getFileHistory()));
+        guiPreferences.getFileHistory().addListener((InvalidationListener) change -> storeFileHistory(guiPreferences.getFileHistory()));
         EasyBind.listen(guiPreferences.lastSelectedIdBasedFetcherProperty(), (obs, oldValue, newValue) -> put(ID_ENTRY_GENERATOR, newValue));
         EasyBind.listen(guiPreferences.mergeDiffModeProperty(), (obs, oldValue, newValue) -> put(MERGE_ENTRIES_DIFF_MODE, newValue.name()));
         EasyBind.listen(guiPreferences.sidePaneWidthProperty(), (obs, oldValue, newValue) -> putDouble(SIDE_PANE_WIDTH, newValue.doubleValue()));
@@ -2592,24 +2585,16 @@ public GuiPreferences getGuiPreferences() {
     }
 
     private FileHistory getFileHistory() {
-        return new FileHistory(getStringList(RECENT_DATABASES).stream()
-                                                              .map(Path::of)
-                                                              .collect(Collectors.toList()));
+        return FileHistory.of(getStringList(RECENT_DATABASES).stream()
+                                                             .map(Path::of)
+                                                             .toList());
     }
 
     private void storeFileHistory(FileHistory history) {
-        if (!history.isEmpty()) {
-            putStringList(RECENT_DATABASES, history.getHistory()
-                                                   .stream()
-                                                   .map(Path::toAbsolutePath)
-                                                   .map(Path::toString)
-                                                   .collect(Collectors.toList()));
-        }
-    }
-
-    @Override
-    public void clearEditedFiles() {
-        prefs.remove(LAST_EDITED);
+        putStringList(RECENT_DATABASES, history.stream()
+                                               .map(Path::toAbsolutePath)
+                                               .map(Path::toString)
+                                               .toList());
     }
 
     //*************************************************************************************************************
diff --git a/src/main/java/org/jabref/preferences/PreferencesService.java b/src/main/java/org/jabref/preferences/PreferencesService.java
index 7da5fdda1a9..678ecfe37a3 100644
--- a/src/main/java/org/jabref/preferences/PreferencesService.java
+++ b/src/main/java/org/jabref/preferences/PreferencesService.java
@@ -26,7 +26,6 @@
 import org.jabref.logic.importer.fetcher.GrobidPreferences;
 import org.jabref.logic.journals.JournalAbbreviationPreferences;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.l10n.Language;
 import org.jabref.logic.layout.LayoutFormatterPreferences;
 import org.jabref.logic.layout.format.FileLinkPreferences;
 import org.jabref.logic.layout.format.NameFormatterPreferences;
@@ -111,10 +110,6 @@ public interface PreferencesService {
     // GeneralPreferences
     //*************************************************************************************************************
 
-    Language getLanguage();
-
-    void setLanguage(Language language);
-
     GeneralPreferences getGeneralPreferences();
 
     TelemetryPreferences getTelemetryPreferences();
@@ -247,8 +242,6 @@ public interface PreferencesService {
 
     GuiPreferences getGuiPreferences();
 
-    void clearEditedFiles();
-
     //*************************************************************************************************************
     // Misc preferences
     //*************************************************************************************************************
diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
index 6210e48b96b..d662162c520 100644
--- a/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
+++ b/src/test/java/org/jabref/logic/formatter/casechanger/CapitalizeFormatterTest.java
@@ -43,6 +43,13 @@ public void formatExample() {
             "UPPER {E}ACH {NOT} FIRST, Upper {E}ach {NOT} First", // multiple words upper case with {}
             "upper each first {NOT} {this}, Upper Each First {NOT} {this}", // multiple words in lower and upper case with {}
             "upper each first {N}OT {t}his, Upper Each First {N}ot {t}his", // multiple words in lower and upper case with {} part 2
+            "upper-each-first, Upper-Each-First", // multiple words lower case with -
+            "Upper-Each-First, Upper-Each-First", // multiple words correct with -
+            "Upper-each-First, Upper-Each-First", // multiple words in lower and upper case with -
+            "UPPER-EACH-FIRST, Upper-Each-First", // multiple words upper case with -
+            "{u}pper-each-{f}irst, {u}pper-Each-{f}irst", // multiple words lower case with {} and -
+            "-upper, -Upper", // single word with -
+            "-{u}pper, -{u}pper", // single word with {} and -
     })
     public void testInputs(String input, String expectedResult) {
         String formattedStr = formatter.format(input);
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
index 884b048d416..7eac2f723a0 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/AstrophysicsDataSystemTest.java
@@ -44,102 +44,96 @@ public void setUp() throws Exception {
                 mock(FieldContentFormatterPreferences.class));
         fetcher = new AstrophysicsDataSystem(importFormatPreferences, importerPreferences);
 
-        diezSliceTheoremEntry = new BibEntry();
-        diezSliceTheoremEntry.setType(StandardEntryType.Article);
-        diezSliceTheoremEntry.setCitationKey("2018arXiv181204698D");
-        diezSliceTheoremEntry.setField(StandardField.AUTHOR, "Diez, Tobias and Rudolph, Gerd");
-        diezSliceTheoremEntry.setField(StandardField.TITLE, "Slice theorem and orbit type stratification in infinite dimensions");
-        diezSliceTheoremEntry.setField(StandardField.YEAR, "2018");
-        diezSliceTheoremEntry.setField(StandardField.ARCHIVEPREFIX, "arXiv");
-        diezSliceTheoremEntry.setField(StandardField.EPRINT, "1812.04698");
-        diezSliceTheoremEntry.setField(StandardField.JOURNAL, "arXiv e-prints");
-        diezSliceTheoremEntry.setField(StandardField.KEYWORDS, "Mathematics - Differential Geometry, Mathematical Physics, 58B25, (58D19, 58B20, 22E99, 58A35)");
-        diezSliceTheoremEntry.setField(StandardField.MONTH, "#dec#");
-        diezSliceTheoremEntry.setField(StandardField.PAGES, "arXiv:1812.04698");
-        diezSliceTheoremEntry.setField(StandardField.EID, "arXiv:1812.04698");
-        diezSliceTheoremEntry.setField(StandardField.PRIMARYCLASS, "math.DG");
-        diezSliceTheoremEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2018arXiv181204698D");
-        diezSliceTheoremEntry.setField(StandardField.ABSTRACT,
-                "We establish a general slice theorem for the action of a locally convex         Lie group on a locally convex manifold, which generalizes the         classical slice theorem of Palais to infinite dimensions. We         discuss two important settings under which the assumptions of         this theorem are fulfilled. First, using Gl{\\\"o}ckner's inverse         function theorem, we show that the linear action of a compact         Lie group on a Fr{\\'e}chet space admits a slice. Second, using         the Nash--Moser theorem, we establish a slice theorem for the         tame action of a tame Fr{\\'e}chet Lie group on a tame         Fr{\\'e}chet manifold. For this purpose, we develop the concept         of a graded Riemannian metric, which allows the construction of         a path-length metric compatible with the manifold topology and         of a local addition. Finally, generalizing a classical result in         finite dimensions, we prove that the existence of a slice         implies that the decomposition of the manifold into orbit types         of the group action is a stratification.");
-
-        famaeyMcGaughEntry = new BibEntry();
-        famaeyMcGaughEntry.setType(StandardEntryType.Article);
-        famaeyMcGaughEntry.setCitationKey("2012LRR....15...10F");
-        famaeyMcGaughEntry.setField(StandardField.AUTHOR, "Famaey, Beno{\\^\\i}t and McGaugh, Stacy S.");
-        famaeyMcGaughEntry.setField(StandardField.TITLE, "Modified Newtonian Dynamics (MOND): Observational Phenomenology and Relativistic Extensions");
-        famaeyMcGaughEntry.setField(StandardField.JOURNAL, "Living Reviews in Relativity");
-        famaeyMcGaughEntry.setField(StandardField.YEAR, "2012");
-        famaeyMcGaughEntry.setField(StandardField.VOLUME, "15");
-        famaeyMcGaughEntry.setField(StandardField.MONTH, "#sep#");
-        famaeyMcGaughEntry.setField(StandardField.NUMBER, "1");
-        famaeyMcGaughEntry.setField(StandardField.ARCHIVEPREFIX, "arXiv");
-        famaeyMcGaughEntry.setField(StandardField.DOI, "10.12942/lrr-2012-10");
-        famaeyMcGaughEntry.setField(StandardField.PRIMARYCLASS, "astro-ph.CO");
-        famaeyMcGaughEntry.setField(StandardField.EID, "10");
-        famaeyMcGaughEntry.setField(StandardField.EPRINT, "1112.3960");
-        famaeyMcGaughEntry.setField(StandardField.PAGES, "10");
-        famaeyMcGaughEntry.setField(StandardField.KEYWORDS, "astronomical observations, Newtonian limit, equations of motion, extragalactic astronomy, cosmology, theories of gravity, fundamental physics, astrophysics, Astrophysics - Cosmology and Nongalactic Astrophysics, Astrophysics - Astrophysics of Galaxies, General Relativity and Quantum Cosmology, High Energy Physics - Phenomenology, High Energy Physics - Theory");
-        famaeyMcGaughEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012LRR....15...10F");
-
-        sunWelchEntry = new BibEntry();
-        sunWelchEntry.setType(StandardEntryType.Article);
-        sunWelchEntry.setCitationKey("2012NatMa..11...44S");
-        sunWelchEntry.setField(StandardField.AUTHOR, "Sun, Yanming and Welch, Gregory C. and Leong, Wei Lin and Takacs, Christopher J. and Bazan, Guillermo C. and Heeger, Alan J.");
-        sunWelchEntry.setField(StandardField.DOI, "10.1038/nmat3160");
-        sunWelchEntry.setField(StandardField.JOURNAL, "Nature Materials");
-        sunWelchEntry.setField(StandardField.MONTH, "#jan#");
-        sunWelchEntry.setField(StandardField.NUMBER, "1");
-        sunWelchEntry.setField(StandardField.PAGES, "44-48");
-        sunWelchEntry.setField(StandardField.TITLE, "Solution-processed small-molecule solar cells with 6.7\\% efficiency");
-        sunWelchEntry.setField(StandardField.VOLUME, "11");
-        sunWelchEntry.setField(StandardField.YEAR, "2012");
-        sunWelchEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012NatMa..11...44S");
-
-        xiongSunEntry = new BibEntry();
-        xiongSunEntry.setType(StandardEntryType.Article);
-        xiongSunEntry.setCitationKey("2007ITGRS..45..879X");
-        xiongSunEntry.setField(StandardField.AUTHOR, "Xiong, Xiaoxiong and Sun, Junqiang and Barnes, William and Salomonson, Vincent and Esposito, Joseph and Erives, Hector and Guenther, Bruce");
-        xiongSunEntry.setField(StandardField.DOI, "10.1109/TGRS.2006.890567");
-        xiongSunEntry.setField(StandardField.JOURNAL, "IEEE Transactions on Geoscience and Remote Sensing");
-        xiongSunEntry.setField(StandardField.MONTH, "#apr#");
-        xiongSunEntry.setField(StandardField.NUMBER, "4");
-        xiongSunEntry.setField(StandardField.PAGES, "879-889");
-        xiongSunEntry.setField(StandardField.TITLE, "Multiyear On-Orbit Calibration and Performance of Terra MODIS Reflective Solar Bands");
-        xiongSunEntry.setField(StandardField.VOLUME, "45");
-        xiongSunEntry.setField(StandardField.YEAR, "2007");
-        xiongSunEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X");
-
-        ingersollPollardEntry = new BibEntry();
-        ingersollPollardEntry.setType(StandardEntryType.Article);
-        ingersollPollardEntry.setCitationKey("1982Icar...52...62I");
-        ingersollPollardEntry.setField(StandardField.ABSTRACT, "If Jupiter's and Saturn's fluid interiors were inviscid and adiabatic,         any steady zonal motion would take the form of differentially         rotating cylinders concentric about the planetary axis of         rotation. B. A. Smith et al. [ Science215, 504-537 (1982)]         showed that Saturn's observed zonal wind profile extends a         significant distance below cloud base. Further extension into         the interior occurs if the values of the eddy viscosity and         superadiabaticity are small. We estimate these values using a         scaling analysis of deep convection in the presence of         differential rotation. The differential rotation inhibits the         convection and reduces the effective eddy viscosity. Viscous         dissipation of zonal mean kinetic energy is then within the         bounds set by the internal heat source. The differential         rotation increases the superadiabaticity, but not so much as to         eliminate the cylindrical structure of the flow. Very large         departures from adiabaticity, necessary for decoupling the         atmosphere and interior, do not occur. Using our scaling         analysis we develop the anelastic equations that describe         motions in Jupiter's and Saturn's interiors. A simple problem is         solved, that of an adiabatic fluid with a steady zonal wind         varying as a function of cylindrical radius. Low zonal         wavenumber perturbations are two dimensional (independent of the         axial coordinate) and obey a modified barotropic stability         equation. The parameter analogous to {\\ensuremath{\\beta}} is         negative and is three to four times larger than the         {\\ensuremath{\\beta}} for thin atmospheres. Jupiter's and         Saturn's observed zonal wind profiles are close to marginal         stability according to this deep sphere criterion, but are         several times supercritical according to the thin atmosphere         criterion.");
-        ingersollPollardEntry.setField(StandardField.AUTHOR, "Ingersoll, A. P. and Pollard, D.");
-        ingersollPollardEntry.setField(StandardField.DOI, "10.1016/0019-1035(82)90169-5");
-        ingersollPollardEntry.setField(StandardField.JOURNAL, "\\icarus");
-        ingersollPollardEntry.setField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS, Lunar and Planetary Exploration; Planets");
-        ingersollPollardEntry.setField(StandardField.MONTH, "#oct#");
-        ingersollPollardEntry.setField(StandardField.NUMBER, "1");
-        ingersollPollardEntry.setField(StandardField.PAGES, "62-80");
-        ingersollPollardEntry.setField(StandardField.TITLE, "Motion in the interiors and atmospheres of Jupiter and Saturn: scale analysis, anelastic equations, barotropic stability criterion");
-        ingersollPollardEntry.setField(StandardField.VOLUME, "52");
-        ingersollPollardEntry.setField(StandardField.YEAR, "1982");
-        ingersollPollardEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/1982Icar...52...62I");
-
-        luceyPaulEntry = new BibEntry();
-        luceyPaulEntry.setType(StandardEntryType.Article);
-        luceyPaulEntry.setCitationKey("2000JGR...10520297L");
-        luceyPaulEntry.setField(StandardField.AUTHOR, "Lucey, Paul G. and Blewett, David T. and Jolliff, Bradley L.");
-        luceyPaulEntry.setField(StandardField.DOI, "10.1029/1999JE001117");
-        luceyPaulEntry.setField(StandardField.JOURNAL, "\\jgr");
-        luceyPaulEntry.setField(StandardField.KEYWORDS, "Planetology: Solid Surface Planets: Composition, Planetology: Solid Surface Planets: Remote sensing, Planetology: Solid Surface Planets: Surface materials and properties, Planetology: Solar System Objects: Moon (1221)");
-        luceyPaulEntry.setField(StandardField.PAGES, "20297-20306");
-        luceyPaulEntry.setField(StandardField.TITLE, "Lunar iron and titanium abundance algorithms based on final processing of Clementine ultraviolet-visible images");
-        luceyPaulEntry.setField(StandardField.VOLUME, "105");
-        luceyPaulEntry.setField(StandardField.YEAR, "2000");
-        luceyPaulEntry.setField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L");
-        luceyPaulEntry.setField(StandardField.MONTH, "#jan#");
-        luceyPaulEntry.setField(StandardField.NUMBER, "E8");
-        luceyPaulEntry.setField(StandardField.ABSTRACT, "The Clementine mission to the Moon returned global imaging data         collected by the ultraviolet visible (UVVIS) camera. This data         set is now in a final state of calibration, and a five-band         multispectral digital image model (DIM) of the lunar surface         will soon be available to the science community. We have used         observations of the lunar sample-return sites and stations         extracted from the final DIM in conjunction with compositional         information for returned lunar soils to revise our previously         published algorithms for the spectral determination of the FeO         and TiO$_{2}$ content of the lunar surface. The algorithms         successfully normalize the effects of space weathering so that         composition may be determined without regard to a surface's         state of maturity. These algorithms permit anyone with access to         the standard archived DIM to construct high spatial resolution         maps of FeO and TiO$_{2}$ abundance. Such maps will be of great         utility in a variety of lunar geologic studies.");
+        diezSliceTheoremEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("2018arXiv181204698D")
+                .withField(StandardField.AUTHOR, "Diez, Tobias and Rudolph, Gerd")
+                .withField(StandardField.TITLE, "Slice theorem and orbit type stratification in infinite dimensions")
+                .withField(StandardField.YEAR, "2018")
+                .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+                .withField(StandardField.EPRINT, "1812.04698")
+                .withField(StandardField.JOURNAL, "arXiv e-prints")
+                .withField(StandardField.KEYWORDS, "Mathematics - Differential Geometry, Mathematical Physics, 58B25, (58D19, 58B20, 22E99, 58A35)")
+                .withField(StandardField.MONTH, "#dec#")
+                .withField(StandardField.PAGES, "arXiv:1812.04698")
+                .withField(StandardField.EID, "arXiv:1812.04698")
+                .withField(StandardField.PRIMARYCLASS, "math.DG")
+                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2018arXiv181204698D")
+                .withField(StandardField.ABSTRACT,
+                        "We establish a general slice theorem for the action of a locally convex         Lie group on a locally convex manifold, which generalizes the         classical slice theorem of Palais to infinite dimensions. We         discuss two important settings under which the assumptions of         this theorem are fulfilled. First, using Gl{\\\"o}ckner's inverse         function theorem, we show that the linear action of a compact         Lie group on a Fr{\\'e}chet space admits a slice. Second, using         the Nash--Moser theorem, we establish a slice theorem for the         tame action of a tame Fr{\\'e}chet Lie group on a tame         Fr{\\'e}chet manifold. For this purpose, we develop the concept         of a graded Riemannian metric, which allows the construction of         a path-length metric compatible with the manifold topology and         of a local addition. Finally, generalizing a classical result in         finite dimensions, we prove that the existence of a slice         implies that the decomposition of the manifold into orbit types         of the group action is a stratification.");
+
+        famaeyMcGaughEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("2012LRR....15...10F")
+                .withField(StandardField.AUTHOR, "Famaey, Beno{\\^\\i}t and McGaugh, Stacy S.")
+                .withField(StandardField.TITLE, "Modified Newtonian Dynamics (MOND): Observational Phenomenology and Relativistic Extensions")
+                .withField(StandardField.JOURNAL, "Living Reviews in Relativity")
+                .withField(StandardField.YEAR, "2012")
+                .withField(StandardField.VOLUME, "15")
+                .withField(StandardField.MONTH, "#sep#")
+                .withField(StandardField.NUMBER, "1")
+                .withField(StandardField.ARCHIVEPREFIX, "arXiv")
+                .withField(StandardField.DOI, "10.12942/lrr-2012-10")
+                .withField(StandardField.PRIMARYCLASS, "astro-ph.CO")
+                .withField(StandardField.EID, "10")
+                .withField(StandardField.EPRINT, "1112.3960")
+                .withField(StandardField.PAGES, "10")
+                .withField(StandardField.KEYWORDS, "astronomical observations, Newtonian limit, equations of motion, extragalactic astronomy, cosmology, theories of gravity, fundamental physics, astrophysics, Astrophysics - Cosmology and Nongalactic Astrophysics, Astrophysics - Astrophysics of Galaxies, General Relativity and Quantum Cosmology, High Energy Physics - Phenomenology, High Energy Physics - Theory")
+                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012LRR....15...10F");
+
+        sunWelchEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("2012NatMa..11...44S")
+                .withField(StandardField.AUTHOR, "Sun, Yanming and Welch, Gregory C. and Leong, Wei Lin and Takacs, Christopher J. and Bazan, Guillermo C. and Heeger, Alan J.")
+                .withField(StandardField.DOI, "10.1038/nmat3160")
+                .withField(StandardField.JOURNAL, "Nature Materials")
+                .withField(StandardField.MONTH, "#jan#")
+                .withField(StandardField.NUMBER, "1")
+                .withField(StandardField.PAGES, "44-48")
+                .withField(StandardField.TITLE, "Solution-processed small-molecule solar cells with 6.7\\% efficiency")
+                .withField(StandardField.VOLUME, "11")
+                .withField(StandardField.YEAR, "2012")
+                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2012NatMa..11...44S");
+
+        xiongSunEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("2007ITGRS..45..879X")
+                .withField(StandardField.AUTHOR, "Xiong, Xiaoxiong and Sun, Junqiang and Barnes, William and Salomonson, Vincent and Esposito, Joseph and Erives, Hector and Guenther, Bruce")
+                .withField(StandardField.DOI, "10.1109/TGRS.2006.890567")
+                .withField(StandardField.JOURNAL, "IEEE Transactions on Geoscience and Remote Sensing")
+                .withField(StandardField.MONTH, "#apr#")
+                .withField(StandardField.NUMBER, "4")
+                .withField(StandardField.PAGES, "879-889")
+                .withField(StandardField.TITLE, "Multiyear On-Orbit Calibration and Performance of Terra MODIS Reflective Solar Bands")
+                .withField(StandardField.VOLUME, "45")
+                .withField(StandardField.YEAR, "2007")
+                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2007ITGRS..45..879X");
+
+        ingersollPollardEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("1982Icar...52...62I")
+                .withField(StandardField.ABSTRACT, "If Jupiter's and Saturn's fluid interiors were inviscid and adiabatic,         any steady zonal motion would take the form of differentially         rotating cylinders concentric about the planetary axis of         rotation. B. A. Smith et al. [ Science215, 504-537 (1982)]         showed that Saturn's observed zonal wind profile extends a         significant distance below cloud base. Further extension into         the interior occurs if the values of the eddy viscosity and         superadiabaticity are small. We estimate these values using a         scaling analysis of deep convection in the presence of         differential rotation. The differential rotation inhibits the         convection and reduces the effective eddy viscosity. Viscous         dissipation of zonal mean kinetic energy is then within the         bounds set by the internal heat source. The differential         rotation increases the superadiabaticity, but not so much as to         eliminate the cylindrical structure of the flow. Very large         departures from adiabaticity, necessary for decoupling the         atmosphere and interior, do not occur. Using our scaling         analysis we develop the anelastic equations that describe         motions in Jupiter's and Saturn's interiors. A simple problem is         solved, that of an adiabatic fluid with a steady zonal wind         varying as a function of cylindrical radius. Low zonal         wavenumber perturbations are two dimensional (independent of the         axial coordinate) and obey a modified barotropic stability         equation. The parameter analogous to {\\ensuremath{\\beta}} is         negative and is three to four times larger than the         {\\ensuremath{\\beta}} for thin atmospheres. Jupiter's and         Saturn's observed zonal wind profiles are close to marginal         stability according to this deep sphere criterion, but are         several times supercritical according to the thin atmosphere         criterion.")
+                .withField(StandardField.AUTHOR, "Ingersoll, A.~P. and Pollard, D.")
+                .withField(StandardField.DOI, "10.1016/0019-1035(82)90169-5")
+                .withField(StandardField.JOURNAL, "\\icarus")
+                .withField(StandardField.KEYWORDS, "Atmospheric Circulation, Barotropic Flow, Convective Flow, Flow Stability, Jupiter Atmosphere, Rotating Fluids, Saturn Atmosphere, Adiabatic Flow, Anelasticity, Compressible Fluids, Planetary Rotation, Rotating Cylinders, Scaling Laws, Wind Profiles, PLANETS, JUPITER, SATURN, MOTION, INTERIORS, ATMOSPHERE, ANALYSIS, SCALE, BAROTROPY, CHARACTERISTICS, STRUCTURE, WINDS, VISCOSITY, DATA, CONVECTION, ROTATION, EDDY EFFECTS, ENERGY, ADIABATICITY, DIAGRAMS, REVIEW, LATITUDE, ZONES, VELOCITY, MATHEMATICAL MODELS, HEAT FLOW, EQUATIONS OF MOTION, FLUIDS, DYNAMICS, TEMPERATURE, GRADIENTS, Lunar and Planetary Exploration; Planets")
+                .withField(StandardField.MONTH, "#oct#")
+                .withField(StandardField.NUMBER, "1")
+                .withField(StandardField.PAGES, "62-80")
+                .withField(StandardField.TITLE, "Motion in the interiors and atmospheres of Jupiter and Saturn: scale analysis, anelastic equations, barotropic stability criterion")
+                .withField(StandardField.VOLUME, "52")
+                .withField(StandardField.YEAR, "1982")
+                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/1982Icar...52...62I");
+
+        luceyPaulEntry = new BibEntry(StandardEntryType.Article)
+                .withCitationKey("2000JGR...10520297L")
+                .withField(StandardField.AUTHOR, "Lucey, Paul G. and Blewett, David T. and Jolliff, Bradley L.")
+                .withField(StandardField.DOI, "10.1029/1999JE001117")
+                .withField(StandardField.JOURNAL, "\\jgr")
+                .withField(StandardField.KEYWORDS, "Planetology: Solid Surface Planets: Composition, Planetology: Solid Surface Planets: Remote sensing, Planetology: Solid Surface Planets: Surface materials and properties, Planetology: Solar System Objects: Moon (1221)")
+                .withField(StandardField.PAGES, "20297-20306")
+                .withField(StandardField.TITLE, "Lunar iron and titanium abundance algorithms based on final processing of Clementine ultraviolet-visible images")
+                .withField(StandardField.VOLUME, "105")
+                .withField(StandardField.YEAR, "2000")
+                .withField(StandardField.URL, "https://ui.adsabs.harvard.edu/abs/2000JGR...10520297L")
+                .withField(StandardField.MONTH, "#jan#")
+                .withField(StandardField.NUMBER, "E8")
+                .withField(StandardField.ABSTRACT, "The Clementine mission to the Moon returned global imaging data         collected by the ultraviolet visible (UVVIS) camera. This data         set is now in a final state of calibration, and a five-band         multispectral digital image model (DIM) of the lunar surface         will soon be available to the science community. We have used         observations of the lunar sample-return sites and stations         extracted from the final DIM in conjunction with compositional         information for returned lunar soils to revise our previously         published algorithms for the spectral determination of the FeO         and TiO$_{2}$ content of the lunar surface. The algorithms         successfully normalize the effects of space weathering so that         composition may be determined without regard to a surface's         state of maturity. These algorithms permit anyone with access to         the standard archived DIM to construct high spatial resolution         maps of FeO and TiO$_{2}$ abundance. Such maps will be of great         utility in a variety of lunar geologic studies.");
     }
 
     @Test
@@ -156,9 +150,9 @@ public void searchByQueryFindsEntry() throws Exception {
 
     @Test
     public void searchByEntryFindsEntry() throws Exception {
-        BibEntry searchEntry = new BibEntry();
-        searchEntry.setField(StandardField.TITLE, "slice theorem");
-        searchEntry.setField(StandardField.AUTHOR, "Diez");
+        BibEntry searchEntry = new BibEntry()
+                .withField(StandardField.TITLE, "slice theorem")
+                .withField(StandardField.AUTHOR, "Diez");
 
         List<BibEntry> fetchedEntries = fetcher.performSearch(searchEntry);
 
diff --git a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
index 367e2f6be9a..1883b908fa8 100644
--- a/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
+++ b/src/test/java/org/jabref/logic/importer/fetcher/CompositeIdFetcherTest.java
@@ -41,6 +41,7 @@ public static Stream<Arguments> performSearchByIdReturnsCorrectEntryForIdentifie
                                 .withField(StandardField.DATE, "2021-10-06")
                                 .withField(StandardField.ABSTRACT, "In the era of large-scale spectroscopic surveys in the Local Group (LG), we can explore using chemical abundances of halo stars to study the star formation and chemical enrichment histories of the dwarf galaxy progenitors of the Milky Way (MW) and M31 stellar halos. In this paper, we investigate using the Chemical Abundance Ratio Distributions (CARDs) of seven stellar halos from the Latte suite of FIRE-2 simulations. We attempt to infer galaxies' assembly histories by modelling the CARDs of the stellar halos of the Latte galaxies as a linear combination of template CARDs from disrupted dwarfs, with different stellar masses $M_{\\star}$ and quenching times $t_{100}$. We present a method for constructing these templates using present-day dwarf galaxies. For four of the seven Latte halos studied in this work, we recover the mass spectrum of accreted dwarfs to a precision of $<10\\%$. For the fraction of mass accreted as a function of $t_{100}$, we find residuals of $20-30\\%$ for five of the seven simulations. We discuss the failure modes of this method, which arise from the diversity of star formation and chemical enrichment histories dwarf galaxies can take. These failure cases can be robustly identified by the high model residuals. Though the CARDs modeling method does not successfully infer the assembly histories in these cases, the CARDs of these disrupted dwarfs contain signatures of their unusual formation histories. Our results are promising for using CARDs to learn more about the histories of the progenitors of the MW and M31 stellar halos.")
                                 .withField(StandardField.EPRINT, "2110.02957")
+                                .withField(StandardField.DOI, "10.3847/1538-4357/ac78ea")
                                 .withField(StandardField.FILE, ":http\\://arxiv.org/pdf/2110.02957v1:PDF")
                                 .withField(StandardField.EPRINTTYPE, "arXiv")
                                 .withField(StandardField.EPRINTCLASS, "astro-ph.GA")
diff --git a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java b/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
index 38f63a6c87d..6d37300cfa3 100644
--- a/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
+++ b/src/test/java/org/jabref/logic/util/io/FileHistoryTest.java
@@ -1,8 +1,8 @@
 package org.jabref.logic.util.io;
 
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -16,14 +16,14 @@ class FileHistoryTest {
 
     @BeforeEach
     void setUp() {
-        history = new FileHistory(new ArrayList<>());
+        history = FileHistory.of(Collections.emptyList());
     }
 
     @Test
     void newItemsAreAddedInRightOrder() {
         history.newFile(Path.of("aa"));
         history.newFile(Path.of("bb"));
-        assertEquals(Arrays.asList(Path.of("bb"), Path.of("aa")), history.getHistory());
+        assertEquals(Arrays.asList(Path.of("bb"), Path.of("aa")), history);
     }
 
     @Test
@@ -31,7 +31,7 @@ void itemsAlreadyInListIsMovedToTop() {
         history.newFile(Path.of("aa"));
         history.newFile(Path.of("bb"));
         history.newFile(Path.of("aa"));
-        assertEquals(Arrays.asList(Path.of("aa"), Path.of("bb")), history.getHistory());
+        assertEquals(Arrays.asList(Path.of("aa"), Path.of("bb")), history);
     }
 
     @Test
@@ -42,7 +42,7 @@ void removeItemsLeavesOtherItemsInRightOrder() {
 
         history.removeItem(Path.of("bb"));
 
-        assertEquals(Arrays.asList(Path.of("cc"), Path.of("aa")), history.getHistory());
+        assertEquals(Arrays.asList(Path.of("cc"), Path.of("aa")), history);
     }
 
     @Test
@@ -66,7 +66,7 @@ void getFileAtTest() {
         history.newFile(Path.of("aa"));
         history.newFile(Path.of("bb"));
         history.newFile(Path.of("cc"));
-        assertEquals(Path.of("bb"), history.getFileAt(1));
+        assertEquals(Path.of("bb"), history.get(1));
     }
 }
 
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestGenreMapping.bib b/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestGenreMapping.bib
new file mode 100644
index 00000000000..907ce08b8da
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestGenreMapping.bib
@@ -0,0 +1,2 @@
+@proceedings{TestPublication,
+}
diff --git a/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestGenreMapping.xml b/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestGenreMapping.xml
new file mode 100644
index 00000000000..ef8ad54b2a2
--- /dev/null
+++ b/src/test/resources/org/jabref/logic/importer/fileformat/MODSImporterTestGenreMapping.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modsCollection xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.loc.gov/mods/v3"
+                xsi:schemaLocation="http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd">
+<mods version="3.3">
+<genre authority="gmgpc">Conference Publication</genre>
+<identifier type="citekey">TestPublication</identifier>
+</mods>
+</modsCollection>